summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-02-06 12:47:05 -0700
committerMartin Roth <martinroth@google.com>2016-02-09 22:31:12 +0100
commitf80331f261d338ce05c5a3ab74a7d4a0d6ba678d (patch)
tree6daf899c716725a976b5ff11cc57770317df8821
parentd4adf58e03164615a64ba614d9353301ee8e7abd (diff)
downloadcoreboot-f80331f261d338ce05c5a3ab74a7d4a0d6ba678d.tar.xz
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 <martinroth@google.com> Reviewed-on: https://review.coreboot.org/13617 Tested-by: build bot (Jenkins) Reviewed-by: Leroy P Leahy <leroy.p.leahy@intel.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--payloads/external/Makefile.inc1
-rw-r--r--payloads/external/SeaBIOS/Makefile.inc2
2 files changed, 2 insertions, 1 deletions
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