Take the console (etc) parameters from the patchable header, instead of

hard-coded constants.
Now the updated installboot can be used to modify the console and baud rate.
This commit is contained in:
dsl 2005-11-11 21:42:13 +00:00
parent f72297cc7e
commit 80d1184f76
3 changed files with 19 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2005/08/21 23:04:30 chs Exp $
# $NetBSD: Makefile,v 1.9 2005/11/11 21:42:13 dsl Exp $
S= ${.CURDIR}/../../../../
@ -33,8 +33,14 @@ CPUFLAGS= -mcpu=i386
CPPFLAGS+= -DSLOW # for libz
.if (${BASE} == "pxeboot_ia32")
# Take config values from patchable header
CPPFLAGS+= -DSUPPORT_SERIAL=boot_params.bp_consdev
CPPFLAGS+= -DCONSPEED=boot_params.bp_conspeed
CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr
CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap
CPPFLAGS+= -DDIRECT_SERIAL
# Various serial line configurations
CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
# or
#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0KBD
# or

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.9 2005/08/21 23:02:34 chs Exp $ */
/* $NetBSD: main.c,v 1.10 2005/11/11 21:42:13 dsl Exp $ */
/*
* Copyright (c) 1996
@ -36,6 +36,10 @@
*
*/
#include <sys/types.h>
#include <sys/reboot.h>
#include <sys/bootblock.h>
#include <lib/libkern/libkern.h>
#include <lib/libsa/stand.h>
@ -43,6 +47,8 @@
#include <libi386.h>
#include "pxeboot.h"
extern struct x86_boot_params boot_params;
int errno;
int debug;

View File

@ -1,4 +1,4 @@
/* $NetBSD: start_pxe.S,v 1.3 2004/08/19 10:34:36 junyoung Exp $ */
/* $NetBSD: start_pxe.S,v 1.4 2005/11/11 21:42:13 dsl Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -52,8 +52,9 @@ ENTRY(start)
jmp 1f
.balign 4
.long X86_BOOT_MAGIC_PXE
boot_params:
.long 1f - boot_params
.globl _C_LABEL(boot_params)
_C_LABEL(boot_params):
.long 1f - _C_LABEL(boot_params)
#include <boot_params.S>
.space 4 * 4 /* some spare */
1: