diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-09-03 08:12:20 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-09-03 08:12:20 +0000 |
| commit | 27cb47196a3d2480ab7436f1c5deec280cc8c738 (patch) | |
| tree | 0071006c03bad8f4f8429ee0ae51c16f6cbe2c77 | |
| parent | 0204ca844f466667d7273eba6456bccf718c6084 (diff) | |
Notes
| -rw-r--r-- | sys/boot/i386/pxeldr/Makefile | 5 | ||||
| -rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.S | 5 | ||||
| -rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.s | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile index 6ba21a37c337..f47159542ef2 100644 --- a/sys/boot/i386/pxeldr/Makefile +++ b/sys/boot/i386/pxeldr/Makefile @@ -17,6 +17,11 @@ M4?= m4 M4FLAGS+= -DPROBE_KEYBOARD .endif +.if defined(BOOT_PXELDR_ALWAYS_SERIAL) +M4FLAGS+= -DALWAYS_SERIAL +.endif + + .if exists(${.OBJDIR}/../loader) LOADERBIN= ${.OBJDIR}/../loader/loader.bin .else diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S index 05383e0c0206..fa93c9c6997d 100644 --- a/sys/boot/i386/pxeldr/pxeldr.S +++ b/sys/boot/i386/pxeldr/pxeldr.S @@ -110,6 +110,11 @@ start: cld # string ops inc orb $KARGS_FLAGS_PXE, 0x8(%bx) # kargs->bootflags |= # KARGS_FLAGS_PXE popl 0xc(%bx) # kargs->pxeinfo = *PXENV+ +ifdef(`ALWAYS_SERIAL',` +# +# set the RBX_SERIAL bit in the howto byte. + orl $RB_SERIAL, (%bx) # enable serial console +') ifdef(`PROBE_KEYBOARD',` # # Look at the BIOS data area to see if we have an enhanced keyboard. If not, diff --git a/sys/boot/i386/pxeldr/pxeldr.s b/sys/boot/i386/pxeldr/pxeldr.s index 05383e0c0206..fa93c9c6997d 100644 --- a/sys/boot/i386/pxeldr/pxeldr.s +++ b/sys/boot/i386/pxeldr/pxeldr.s @@ -110,6 +110,11 @@ start: cld # string ops inc orb $KARGS_FLAGS_PXE, 0x8(%bx) # kargs->bootflags |= # KARGS_FLAGS_PXE popl 0xc(%bx) # kargs->pxeinfo = *PXENV+ +ifdef(`ALWAYS_SERIAL',` +# +# set the RBX_SERIAL bit in the howto byte. + orl $RB_SERIAL, (%bx) # enable serial console +') ifdef(`PROBE_KEYBOARD',` # # Look at the BIOS data area to see if we have an enhanced keyboard. If not, |