From fd6fb26ae77ae125fb9b9f0c7949e3e8b5796fd1 Mon Sep 17 00:00:00 2001
From: Aaron Durbin <adurbin@chromium.org>
Date: Wed, 13 May 2015 13:37:43 -0500
Subject: [PATCH] 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 <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/10196
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
---
 src/console/Makefile.inc      | 2 ++
 src/drivers/uart/Makefile.inc | 1 +
 src/include/console/console.h | 2 +-
 src/include/console/uart.h    | 2 +-
 src/lib/Makefile.inc          | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 75a75eb32e..cae8f605b8 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -6,6 +6,8 @@ ramstage-y += die.c
 smm-$(CONFIG_DEBUG_SMI) += init.c console.c vtxprintf.c printk.c
 smm-$(CONFIG_SMM_TSEG) += die.c
 
+verstage-y += init.c
+verstage-y += printk.c
 verstage-y += vtxprintf.c
 verstage-y += console.c
 verstage-y += die.c
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index 1c2b69ee78..509837ec3f 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -4,6 +4,7 @@ romstage-y += util.c
 ramstage-y += util.c
 bootblock-y += util.c
 secmon-y += util.c
+verstage-y += util.c
 smm-$(CONFIG_DEBUG_SMI) += util.c
 
 # Add the driver, only one can be enabled. The driver files may
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__
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index db83698a04..7d374c6d00 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -141,11 +141,13 @@ romstage-y += version.c
 ramstage-y += version.c
 smm-y += version.c
 secmon-y += version.c
+verstage-y += version.c
 
 $(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.verstage.o : $(obj)/build.h
 
 romstage-y += bootmode.c
 ramstage-y += bootmode.c