[coreboot-gerrit] Change in coreboot[master]: console: Handle verstage as "first non-bootblock stage"

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56210 )

Change subject: console: Handle verstage as "first non-bootblock stage"
......................................................................

console: Handle verstage as "first non-bootblock stage"

It doesn't make much sense to have bootblock and romstage special cased
when there's a verstage in-between: Use the special case in bootblock
and verstage in that case.

Change-Id: I494a33483e306a049aa0c8137a118644fc28177e
Signed-off-by: Patrick Georgi 
---
M src/console/init.c
1 file changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/56210/1

diff --git a/src/console/init.c b/src/console/init.c
index a2ceb58..d727f64 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -8,7 +8,11 @@
 #include <option.h>
 #include <version.h>

+#if CONFIG(VBOOT_SEPARATE_VERSTAGE)
+#define FIRST_CONSOLE (ENV_BOOTBLOCK || (CONFIG(NO_BOOTBLOCK_CONSOLE) && ENV_SEPARATE_VERSTAGE))
+#else
 #define FIRST_CONSOLE (ENV_BOOTBLOCK || (CONFIG(NO_BOOTBLOCK_CONSOLE) && ENV_ROMSTAGE))
+#endif

static int console_inited;
 static int console_loglevel;