summaryrefslogtreecommitdiff
path: root/src/mainboard/google/zork/variants
diff options
context:
space:
mode:
authorMartin Roth <martin@coreboot.org>2020-11-12 10:33:43 -0700
committerFelix Held <felix-coreboot@felixheld.de>2020-11-17 08:38:44 +0000
commit560c11ec65ee7c0a669b040546fbdea8a353926e (patch)
tree7cf5a79eeec277e8d6d72a61b1f936e82409c8c3 /src/mainboard/google/zork/variants
parent5014373edd89835609101821befc6d89dcaadb10 (diff)
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 <martin@coreboot.org> Change-Id: I30d90fe82c37966a860b52c07a3550dcecf8d19d Reviewed-on: https://review.coreboot.org/c/coreboot/+/47529 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/zork/variants')
-rw-r--r--src/mainboard/google/zork/variants/baseboard/Makefile.inc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mainboard/google/zork/variants/baseboard/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/Makefile.inc
index c8d57ff9b5..2764a89b08 100644
--- a/src/mainboard/google/zork/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/zork/variants/baseboard/Makefile.inc
@@ -7,10 +7,8 @@ bootblock-$(CONFIG_BOARD_GOOGLE_BASEBOARD_DALBOZ) += gpio_baseboard_dalboz.c
verstage-y += gpio_baseboard_common.c
verstage-y += helpers.c
-ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
verstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_TREMBYLE) += gpio_baseboard_trembyle.c
verstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_DALBOZ) += gpio_baseboard_dalboz.c
-endif
verstage-y += tpm_tis.c
romstage-y += gpio_baseboard_common.c