diff options
| author | Martin Roth <martin.roth@se-eng.com> | 2014-07-25 14:33:49 -0600 |
|---|---|---|
| committer | Martin Roth <gaumless@gmail.com> | 2014-07-31 19:03:16 +0200 |
| commit | 0d7f133c38673af2dae06988d418606d7f5628ac (patch) | |
| tree | f6d45e90ea84783029f5c0f2b763c37af86b1479 | |
| parent | 97804520bdf63816a71663824b8c514f949a0225 (diff) | |
| download | coreboot-0d7f133c38673af2dae06988d418606d7f5628ac.tar.xz | |
payloads/external/SeaBIOS: Use coreboot’s serial console settings
Set up the serial console on SeaBIOS to match coreboot's settings.
Previously, we were just forcing it on, and setting it to 0x3f8.
Change-Id: I107245c8bd1ba2cf948c6671337c6169226aaaaf
Signed-off-by: Martin Roth <martin.roth@se-eng.com>
Reviewed-on: http://review.coreboot.org/6363
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
| -rw-r--r-- | payloads/external/SeaBIOS/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.inc | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index e981309381..21f933a875 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -25,7 +25,12 @@ checkout: fetch config: checkout echo " CONFIG SeaBIOS $(TAG-y)" echo "CONFIG_COREBOOT=y" > $(OUT)/seabios/.config +ifeq ($(CONFIG_CONSOLE_SERIAL),y) echo "CONFIG_DEBUG_SERIAL=y" >> $(OUT)/seabios/.config + echo "CONFIG_DEBUG_SERIAL_PORT=$(CONFIG_TTYS0_BASE)" >> $(OUT)/seabios/.config +else + echo "# CONFIG_DEBUG_SERIAL is not set" >> $(OUT)/seabios/.config +endif ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) echo "# CONFIG_THREAD_OPTIONROMS is not set" >> $(OUT)/seabios/.config endif diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index c0e908d46f..2e92d89acd 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -350,6 +350,8 @@ seabios: CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \ CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \ CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \ + CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \ + CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \ OUT=$(abspath $(obj)) IASL="$(IASL)" filo: |