From 2591e937e76ccb797d77adbcb667939ca9dfdae5 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 13 May 2015 13:38:59 -0500 Subject: secmon: allow for serial console Add necessary checks and objects for secmon serial console. Change-Id: Ibafa19061255ef6847a424922565a866328ff34c Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/10197 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- src/include/console/uart.h | 2 +- src/lib/Makefile.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 7c744dddd2..1304003c8a 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_SECMON || (ENV_SMM && CONFIG_DEBUG_SMI)) #if __CONSOLE_SERIAL_ENABLE__ static inline void __uart_init(void) { uart_init(CONFIG_UART_FOR_CONSOLE); } diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 7d374c6d00..d6d7b84190 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -147,6 +147,7 @@ $(obj)/lib/version.bootblock.o : $(obj)/build.h $(obj)/lib/version.romstage.o : $(obj)/build.h $(obj)/lib/version.ramstage.o : $(obj)/build.h $(obj)/lib/version.smm.o : $(obj)/build.h +$(obj)/lib/version.secmon.o : $(obj)/build.h $(obj)/lib/version.verstage.o : $(obj)/build.h romstage-y += bootmode.c -- cgit v1.2.3