From 0b0c9454eeb30839eb40a14e40c28d0857024dc4 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Sun, 24 Jul 2016 19:22:17 -0700 Subject: [PATCH] UPSTREAM: drivers/uart: Enable debug serial output during postcar Build the UART drivers for the postcar stage. TEST=Build and run on Galileo Gen2 Change-Id: I8bf51135ab7e62fa4bc3e8d45583f2feac56942f Original-Signed-off-by: Lee Leahy Original-Reviewed-on: https://review.coreboot.org/15843 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/363380 Reviewed-by: Furquan Shaikh --- src/drivers/uart/Makefile.inc | 5 +++++ src/include/console/uart.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc index 4b2aa53507..a39cbefed1 100644 --- a/src/drivers/uart/Makefile.inc +++ b/src/drivers/uart/Makefile.inc @@ -1,6 +1,7 @@ ifeq ($(CONFIG_DRIVERS_UART),y) romstage-y += util.c +postcar-y += util.c ramstage-y += util.c bootblock-y += util.c verstage-y += util.c @@ -13,6 +14,7 @@ ifeq ($(CONFIG_DRIVERS_UART_8250IO),y) bootblock-y += uart8250io.c verstage-y += uart8250io.c romstage-y += uart8250io.c +postcar-y += uart8250io.c ramstage-y += uart8250io.c smm-$(CONFIG_DEBUG_SMI) += uart8250io.c endif @@ -21,18 +23,21 @@ ifeq ($(CONFIG_DRIVERS_UART_8250MEM),y) bootblock-y += uart8250mem.c verstage-y += uart8250mem.c romstage-y += uart8250mem.c +postcar-y += uart8250mem.c ramstage-y += uart8250mem.c smm-$(CONFIG_DEBUG_SMI) += uart8250mem.c endif ifeq ($(CONFIG_DRIVERS_UART_OXPCIE),y) ramstage-y += oxpcie_early.c oxpcie.c +postcar-y += oxpcie_early.c romstage-y += oxpcie_early.c endif ifeq ($(CONFIG_DRIVERS_UART_PL011),y) bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c romstage-y += pl011.c +postcar-y += pl011.c ramstage-y += pl011.c endif diff --git a/src/include/console/uart.h b/src/include/console/uart.h index a3d650b500..ffcc088422 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -57,7 +57,7 @@ void oxford_remap(unsigned int new_base); #define __CONSOLE_SERIAL_ENABLE__ CONFIG_CONSOLE_SERIAL && \ (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \ - (ENV_SMM && CONFIG_DEBUG_SMI)) + ENV_POSTCAR || (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_SERIAL_ENABLE__ static inline void __uart_init(void) { uart_init(CONFIG_UART_FOR_CONSOLE); }