From 560c11ec65ee7c0a669b040546fbdea8a353926e Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 12 Nov 2020 10:33:43 -0700 Subject: mb/google/zork: Assume VBOOT_STARTS_BEFORE_BOOTBLOCK At this point, the zork platform will only use psp_verstage, so remove the VBOOT_STARTS_IN_BOOTBLOCK option and set code for VBOOT_STARTS- BEFORE_BOOTBLOCK to always be used. TEST=Build & Boot Morphius BRANCH=Zork BUG=b:172848137 Signed-off-by: Martin Roth Change-Id: I30d90fe82c37966a860b52c07a3550dcecf8d19d Reviewed-on: https://review.coreboot.org/c/coreboot/+/47529 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/zork/Makefile.inc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/mainboard/google/zork/Makefile.inc') diff --git a/src/mainboard/google/zork/Makefile.inc b/src/mainboard/google/zork/Makefile.inc index 88aef867de..96c97b68d3 100644 --- a/src/mainboard/google/zork/Makefile.inc +++ b/src/mainboard/google/zork/Makefile.inc @@ -9,11 +9,7 @@ ramstage-y += chromeos.c ramstage-y += ec.c ramstage-y += sku_id.c -ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) verstage-y += verstage.c -else -verstage-y += chromeos.c -endif smm-y += smihandler.c -- cgit v1.2.3