瀏覽代碼

[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>
tags/v1.20.1
Michael Brown 10 年之前
父節點
當前提交
9aa55f811a
共有 1 個檔案被更改,包括 3 行新增1 行删除
  1. 3
    1
      src/arch/i386/interface/syslinux/comboot_call.c

+ 3
- 1
src/arch/i386/interface/syslinux/comboot_call.c 查看文件

84
 /* Mode flags set by INT 22h AX=0017h */
84
 /* Mode flags set by INT 22h AX=0017h */
85
 static uint16_t comboot_graphics_mode = 0;
85
 static uint16_t comboot_graphics_mode = 0;
86
 
86
 
87
-
88
 /**
87
 /**
89
  * Print a string with a particular terminator
88
  * Print a string with a particular terminator
90
  */
89
  */
713
 	unhook_bios_interrupt ( 0x22, ( unsigned int ) int22_wrapper,
712
 	unhook_bios_interrupt ( 0x22, ( unsigned int ) int22_wrapper,
714
 				&int22_vector );
713
 				&int22_vector );
715
 }
714
 }
715
+
716
+/* Avoid dragging in serial console support unconditionally */
717
+struct uart serial_console __attribute__ (( weak ));

Loading…
取消
儲存