aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-05-13 13:38:59 -0500
committerAaron Durbin <adurbin@chromium.org>2015-05-13 20:54:00 +0200
commit2591e937e76ccb797d77adbcb667939ca9dfdae5 (patch)
tree58b94bbdc18bc00516e6d3739016acbba923a585
parentfd6fb26ae77ae125fb9b9f0c7949e3e8b5796fd1 (diff)
downloadcoreboot-2591e937e76ccb797d77adbcb667939ca9dfdae5.tar.gz
coreboot-2591e937e76ccb797d77adbcb667939ca9dfdae5.tar.xz
coreboot-2591e937e76ccb797d77adbcb667939ca9dfdae5.zip
secmon: allow for serial console
Add necessary checks and objects for secmon serial console. Change-Id: Ibafa19061255ef6847a424922565a866328ff34c Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/10197 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
-rw-r--r--src/include/console/uart.h2
-rw-r--r--src/lib/Makefile.inc1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/include/console/uart.h b/src/include/console/uart.h
index 7c744dddd..1304003c8 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 7d374c6d0..d6d7b8419 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