diff options
| -rw-r--r-- | etc/defaults/make.conf | 21 | ||||
| -rw-r--r-- | etc/make.conf | 21 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 21 | ||||
| -rw-r--r-- | sys/i386/boot/biosboot/Makefile | 20 | ||||
| -rw-r--r-- | sys/i386/boot/rawboot/Makefile | 26 |
5 files changed, 94 insertions, 15 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index f03751e..1c3661d 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.33 1996/10/05 18:51:45 ache Exp $ +# $Id: make.conf,v 1.34 1996/10/05 19:41:31 ache Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -63,6 +63,25 @@ #BOOTWAIT=0 #BOOTWAIT=30000 # +# By default, the system will always use the keyboard/video card as system +# console. However, the boot blocks may be configured to use a serial port +# or probe the hardware to determine if the serial port or kbd/video should +# be used. +# +# By default we use COM1 as our serial console port *if* we're going to use +# a serial port as our console at all. (0x3E8 = COM2) +# +#BOOT_COMCONSOLE= 0x3F8 +# +# Uncomment the following line to test if a keyboard is present. If the +# keyboard isn't there, use the serial port as console. +# +#BOOT_PROBE_KEYBOARD= true +# +# Uncomment the following line to read the keyboard lock switch. If the +# keyboard is locked, use the serial port as console. +# +#BOOT_PROBE_KEYBOARD_LOCK= true # # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. # If you have a XFree86 from before 3.0 that has the X distribution in diff --git a/etc/make.conf b/etc/make.conf index f03751e..1c3661d 100644 --- a/etc/make.conf +++ b/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.33 1996/10/05 18:51:45 ache Exp $ +# $Id: make.conf,v 1.34 1996/10/05 19:41:31 ache Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -63,6 +63,25 @@ #BOOTWAIT=0 #BOOTWAIT=30000 # +# By default, the system will always use the keyboard/video card as system +# console. However, the boot blocks may be configured to use a serial port +# or probe the hardware to determine if the serial port or kbd/video should +# be used. +# +# By default we use COM1 as our serial console port *if* we're going to use +# a serial port as our console at all. (0x3E8 = COM2) +# +#BOOT_COMCONSOLE= 0x3F8 +# +# Uncomment the following line to test if a keyboard is present. If the +# keyboard isn't there, use the serial port as console. +# +#BOOT_PROBE_KEYBOARD= true +# +# Uncomment the following line to read the keyboard lock switch. If the +# keyboard is locked, use the serial port as console. +# +#BOOT_PROBE_KEYBOARD_LOCK= true # # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. # If you have a XFree86 from before 3.0 that has the X distribution in diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index f03751e..1c3661d 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.33 1996/10/05 18:51:45 ache Exp $ +# $Id: make.conf,v 1.34 1996/10/05 19:41:31 ache Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -63,6 +63,25 @@ #BOOTWAIT=0 #BOOTWAIT=30000 # +# By default, the system will always use the keyboard/video card as system +# console. However, the boot blocks may be configured to use a serial port +# or probe the hardware to determine if the serial port or kbd/video should +# be used. +# +# By default we use COM1 as our serial console port *if* we're going to use +# a serial port as our console at all. (0x3E8 = COM2) +# +#BOOT_COMCONSOLE= 0x3F8 +# +# Uncomment the following line to test if a keyboard is present. If the +# keyboard isn't there, use the serial port as console. +# +#BOOT_PROBE_KEYBOARD= true +# +# Uncomment the following line to read the keyboard lock switch. If the +# keyboard is locked, use the serial port as console. +# +#BOOT_PROBE_KEYBOARD_LOCK= true # # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. # If you have a XFree86 from before 3.0 that has the X distribution in diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index 85cde18..6590d27 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.48 1996/10/08 22:41:31 bde Exp $ +# $Id: Makefile,v 1.49 1996/10/14 12:37:47 bde Exp $ # PROG= boot @@ -10,18 +10,28 @@ BINDIR= /usr/mdec BINMODE= 444 CFLAGS= -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \ -DDO_BAD144 -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} -CFLAGS+= -DCOMCONSOLE=0x3F8 CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} CFLAGS+= ${CWARNFLAGS} # Probe the keyboard and use the serial console if the keyboard isn't found. -#CFLAGS+= -DPROBE_KEYBOARD +.if defined(BOOT_PROBE_KEYBOARD) +CFLAGS+= -DPROBE_KEYBOARD +.endif # Probe the keyboard lock and use the serial console if the keyboard is locked. -#CFLAGS+= -DPROBE_KEYBOARD_LOCK +.if defined(BOOT_PROBE_KEYBOARD_LOCK) +CFLAGS+= -DPROBE_KEYBOARD_LOCK +.endif # Force use of the serial console. -#CFLAGS+= -DFORCE_COMCONSOLE +.if defined(BOOT_FORCE_COMCONSOLE) +CFLAGS+= -DFORCE_COMCONSOLE +.endif + +# By default, if a serial port is going to be used as console, use COM1 +# (aka /dev/ttyd0). +BOOT_COMCONSOLE_PORT?=0x3F8 +CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} # Enable code to take the default boot string from a fixed location on the # disk. See nextboot(8) and README.386BSD for more info. diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile index 5c136c9..32e8ac1 100644 --- a/sys/i386/boot/rawboot/Makefile +++ b/sys/i386/boot/rawboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.45 1996/09/07 21:16:44 bde Exp $ +# $Id: Makefile,v 1.1 1996/09/11 19:25:11 phk Exp $ # PROG= boot @@ -15,15 +15,27 @@ CFLAGS= -O2 \ -DRAWBOOT \ -I${.CURDIR}/../biosboot \ -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} -CFLAGS+= -DCOMCONSOLE=0x3F8 CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} # Probe the keyboard and use the serial console if the keyboard isn't found. -#CFLAGS+= -DPROBE_KEYBOARD - -# Force use of the serial console (after probing the keyboard if -# PROBE_KEYBOARD is defined). -#CFLAGS+= -DFORCE_COMCONSOLE +.if defined(BOOT_PROBE_KEYBOARD) +CFLAGS+= -DPROBE_KEYBOARD +.endif + +# Probe the keyboard lock and use the serial console if the keyboard is locked. +.if defined(BOOT_PROBE_KEYBOARD_LOCK) +CFLAGS+= -DPROBE_KEYBOARD_LOCK +.endif + +# Force use of the serial console. +.if defined(BOOT_FORCE_COMCONSOLE) +CFLAGS+= -DFORCE_COMCONSOLE +.endif + +# By default, if a serial port is going to be used as console, use COM1 +# (aka /dev/ttyd0). +BOOT_COMCONSOLE_PORT?=0x3F8 +CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} # Enable code to take the default boot string from a fixed location on the # disk. See nextboot(8) and README.386BSD for more info. |
