From fd6fb26ae77ae125fb9b9f0c7949e3e8b5796fd1 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 13 May 2015 13:37:43 -0500 Subject: verstage: provide support for serial console verstage previously lacked serial console support. Add the necessary objects and macro checks to allow verstage to include the serial console. Change-Id: Ibe911ad347cac0b089f5bc0d4263956f44f3d116 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/10196 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- src/include/console/console.h | 2 +- src/include/console/uart.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include/console') diff --git a/src/include/console/console.h b/src/include/console/console.h index ad93a9af9c..65e65bbd57 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -57,7 +57,7 @@ void __attribute__ ((noreturn)) die(const char *msg); #define __CONSOLE_ENABLE__ \ ((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || \ - ENV_SECMON || \ + ENV_SECMON || ENV_VERSTAGE || \ ENV_ROMSTAGE || ENV_RAMSTAGE || (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_ENABLE__ diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 94933fe3fe..7c744dddd2 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -56,7 +56,7 @@ static inline void *uart_platform_baseptr(int idx) void oxford_remap(unsigned int new_base); #define __CONSOLE_SERIAL_ENABLE__ CONFIG_CONSOLE_SERIAL && \ - (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || \ + (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \ (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_SERIAL_ENABLE__ -- cgit v1.2.3