From baba3e961072bfb7ffb4f0031ada27046a58d29e Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 4 May 2020 11:31:18 -0600 Subject: 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 Change-Id: Ifc9fb0810e0816fe0a68e52287eda6145043a619 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41815 Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- src/console/Makefile.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/console') 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 -- cgit v1.2.3