diff options
| author | Michael Brown | 2015-07-31 11:46:15 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-07-31 11:58:05 +0200 |
| commit | 9aa55f811a6f43b83be002a634ccce8b8f2c00f8 (patch) | |
| tree | e1502b4c47d91af5d582aef557b6680e503864e1 | |
| parent | [elf] Reject ELFBoot images requiring virtual addressing (diff) | |
| download | ipxe-9aa55f811a6f43b83be002a634ccce8b8f2c00f8.tar.gz ipxe-9aa55f811a6f43b83be002a634ccce8b8f2c00f8.tar.xz ipxe-9aa55f811a6f43b83be002a634ccce8b8f2c00f8.zip | |
[comboot] Avoid dragging in serial console support unconditionally
When the ability for iPXE to handle multiple serial ports was added,
the choice was made that the singular serial port referred to by
COMBOOT calls should mean the port used for the serial console. This
unintentionally caused IMAGE_COMBOOT to also enable CONSOLE_SERIAL.
Fix by providing a weak-symbol version of the serial console which
will be used if serial console support was not explicitly enabled.
Reported-by: Torgeir Wulfsberg <Torgeir.Wulfsberg@kongsberg.com>
Reported-by: Ján ONDREJ (SAL) <ondrejj@salstar.sk>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/arch/i386/interface/syslinux/comboot_call.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 430bc3a38..69d94c407 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -84,7 +84,6 @@ rmjmp_buf comboot_return; /* Mode flags set by INT 22h AX=0017h */ static uint16_t comboot_graphics_mode = 0; - /** * Print a string with a particular terminator */ @@ -713,3 +712,6 @@ void unhook_comboot_interrupts ( ) { unhook_bios_interrupt ( 0x22, ( unsigned int ) int22_wrapper, &int22_vector ); } + +/* Avoid dragging in serial console support unconditionally */ +struct uart serial_console __attribute__ (( weak )); |