Expose the control mechanism for serial console boot so that the default
shipped with freebsd can be changed without modifying the Makefiles directly. Creates: BOOT_FORCE_COMCONSOLE BOOT_PROBE_KEYBOARD BOOT_PROBE_KEYBOARD_LOCK BOOT_COMCONSOLE (port value for console)
This commit is contained in:
pst
parent
8882da7174
commit
3d16420dd5
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
.if defined(BOOT_PROBE_KEYBOARD)
|
||||
CFLAGS+= -DPROBE_KEYBOARD
|
||||
.endif
|
||||
|
||||
# Force use of the serial console (after probing the keyboard if
|
||||
# PROBE_KEYBOARD is defined).
|
||||
#CFLAGS+= -DFORCE_COMCONSOLE
|
||||
# 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.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user