summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martin@coreboot.org>2020-05-04 11:31:18 -0600
committerMartin Roth <martinroth@google.com>2020-06-15 22:07:12 +0000
commitbaba3e961072bfb7ffb4f0031ada27046a58d29e (patch)
tree8df30beda90cae2838f42bba7f04791e4b1761c2
parentb9c2ecffda4dec8e3c94002aeb12a253b29d1d77 (diff)
console: Update for vboot before bootblock
Exclude pieces of console code from the vboot if running before bootlock. The PSP verstage code will re-implement some of these in its own code. BUG=b:123887623 TEST=Build with following patches Signed-off-by: Martin Roth <martin@coreboot.org> Change-Id: Ifc9fb0810e0816fe0a68e52287eda6145043a619 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41815 Reviewed-by: Raul Rangel <rrangel@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/console/Makefile.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 2154eb9254..e2a20d7ff7 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -11,12 +11,14 @@ smm-$(CONFIG_DEBUG_SMI) += init.c console.c vtxprintf.c printk.c
smm-y += die.c
smm-y += post.c
-verstage-y += init.c
+ifneq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
verstage-y += printk.c
-verstage-y += vtxprintf.c vsprintf.c
verstage-y += console.c
+endif
verstage-y += post.c
verstage-y += die.c
+verstage-y += init.c
+verstage-y += vtxprintf.c vsprintf.c
romstage-y += vtxprintf.c printk.c vsprintf.c
romstage-y += init.c console.c