summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/boot/i386/pxeldr/pxeldr.S10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S
index 12b008be0f32..897e8383b72b 100644
--- a/sys/boot/i386/pxeldr/pxeldr.S
+++ b/sys/boot/i386/pxeldr/pxeldr.S
@@ -25,6 +25,8 @@
* separate PXE-aware client just to load the loader.
*/
+#include <sys/reboot.h>
+
/*
* Memory locations.
*/
@@ -53,10 +55,6 @@
.set KARGS_FLAGS_PXE,0x2 # flag to indicate booting from
# PXE loader
/*
- * Boot howto bits
- */
- .set RB_SERIAL,0x1000 # serial console
-/*
* Segment selectors.
*/
.set SEL_SDATA,0x8 # Supervisor data
@@ -119,11 +117,11 @@ start: cld # string ops inc
#ifdef PROBE_KEYBOARD
/*
* Look at the BIOS data area to see if we have an enhanced keyboard. If not,
- * set the RBX_SERIAL bit in the howto byte.
+ * set the RBX_DUAL and RBX_SERIAL bits in the howto byte.
*/
testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present?
jnz keyb # yes, so skip
- orl $RB_SERIAL, (%bx) # enable serial console
+ orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console
keyb:
#endif
/*