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

@@ -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

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

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__

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__

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