diff options
| author | Philipp Deppenwiese <zaolin@das-labor.org> | 2017-11-29 16:58:05 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-12-20 16:39:50 +0000 |
| commit | d8b4139bcaf4bb82e17646a822a3c21d18a1d615 (patch) | |
| tree | 51e7d5029313b21a5e68a0d16164cfe877adc44d | |
| parent | 22d20d6f1450e0c6cc86f3903b7546f4e0b706cc (diff) | |
payloads/SeaBIOS: Add different MMIO uart configurations
The MMIO address can change for different platforms
like Apollolake.
Change-Id: I6ec72d3a14f00212323a04e20d5a477dbc26b770
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/22631
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | payloads/external/Makefile.inc | 5 | ||||
| -rw-r--r-- | payloads/external/SeaBIOS/Makefile | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 881b4e45b4..62d8a440fa 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -90,7 +90,10 @@ payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG) CONFIG_HUDSON_UART=$(CONFIG_HUDSON_UART) \ CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \ CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \ - CONFIG_SEABIOS_DEBUG_LEVEL=$(CONFIG_SEABIOS_DEBUG_LEVEL) + CONFIG_SEABIOS_DEBUG_LEVEL=$(CONFIG_SEABIOS_DEBUG_LEVEL) \ + CONFIG_DRIVERS_UART_8250MEM_32=$(CONFIG_DRIVERS_UART_8250MEM_32) \ + CONFIG_ENABLE_HSUART=$(CONFIG_ENABLE_HSUART) \ + CONFIG_CONSOLE_UART_BASE_ADDRESS=$(CONFIG_CONSOLE_UART_BASE_ADDRESS) payloads/external/SeaBIOS/seabios/out/vgabios.bin: seabios payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out/bios.bin.elf diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile index b494b48dcf..8b6b0ed94b 100644 --- a/payloads/external/SeaBIOS/Makefile +++ b/payloads/external/SeaBIOS/Makefile @@ -45,6 +45,12 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) else ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250MEM)$(CONFIG_HUDSON_UART),yyy) echo "CONFIG_DEBUG_SERIAL_MMIO=y" >> seabios/.config echo "CONFIG_DEBUG_SERIAL_MEM_ADDRESS=0xFEDC6000" >> seabios/.config +else ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_ENABLE_HSUART),yy) + echo "CONFIG_DEBUG_SERIAL_MMIO=y" >> seabios/.config + echo "CONFIG_DEBUG_SERIAL_MEM_ADDRESS=$(CONFIG_CONSOLE_UART_BASE_ADDRESS)" >> seabios/.config +else ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250MEM_32),yy) + echo "CONFIG_DEBUG_SERIAL_MMIO=y" >> seabios/.config + echo "CONFIG_DEBUG_SERIAL_MEM_ADDRESS=$(CONFIG_CONSOLE_UART_BASE_ADDRESS)" >> seabios/.config else echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config endif |