From f80331f261d338ce05c5a3ab74a7d4a0d6ba678d Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 6 Feb 2016 12:47:05 -0700 Subject: SeaBIOS: Disable serial console if serial is memory mapped SeaBIOS only supports standard IO based serial ports. If the serial port being used by coreboot isn't a standard IO serial port, disable the serial console in the SeaBIOS build. Change-Id: I386b46625fca0bd0a5416ed9831f8370c294ed74 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/13617 Tested-by: build bot (Jenkins) Reviewed-by: Leroy P Leahy Reviewed-by: Stefan Reinauer --- payloads/external/Makefile.inc | 1 + payloads/external/SeaBIOS/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'payloads/external') diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 941af61689..37435071ce 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -48,6 +48,7 @@ seabios: CONFIG_PAYLOAD_CONFIGFILE=$(CONFIG_PAYLOAD_CONFIGFILE) \ CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \ CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \ + CONFIG_DRIVERS_UART_8250IO=$(CONFIG_DRIVERS_UART_8250IO) \ CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \ CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 48a6a6fa0d..e478a09eac 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -25,7 +25,7 @@ checkout: fetch config: checkout echo " CONFIG SeaBIOS $(TAG-y)" echo "CONFIG_COREBOOT=y" > seabios/.config -ifeq ($(CONFIG_CONSOLE_SERIAL),y) +ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) echo "CONFIG_DEBUG_SERIAL=y" >> seabios/.config echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> seabios/.config else -- cgit v1.2.3