Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/62740 )
Change subject: mb/google/guybrush: Fix building with VBOOT_STARTS_IN_BOOTBLOCK ......................................................................
mb/google/guybrush: Fix building with VBOOT_STARTS_IN_BOOTBLOCK
The verstage.c file contains PSP verstage specific code. We don't need it when using x86 verstage.
BUG=b:193050286 TEST=Build and boot guybrush with x86 verstage
Signed-off-by: Raul E Rangel rrangel@chromium.org Change-Id: I6dc928cdce0c922bb18f4479b993c89dff106070 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62740 Reviewed-by: Karthik Ramasubramanian kramasub@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/guybrush/Makefile.inc M src/mainboard/google/guybrush/verstage.c 2 files changed, 1 insertion(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Karthik Ramasubramanian: Looks good to me, approved
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc index 56ef2b3..cdfb53b 100644 --- a/src/mainboard/google/guybrush/Makefile.inc +++ b/src/mainboard/google/guybrush/Makefile.inc @@ -12,7 +12,7 @@
all-y += spi_speeds.c
-verstage-y += verstage.c +verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c verstage-$(CONFIG_CHROMEOS) += chromeos.c
subdirs-y += variants/baseboard diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c index 35bfa0a..f827fdd 100644 --- a/src/mainboard/google/guybrush/verstage.c +++ b/src/mainboard/google/guybrush/verstage.c @@ -13,9 +13,6 @@ const struct soc_amd_gpio *gpios, *override_gpios; size_t num_gpios, override_num_gpios;
- if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) - return; - gpios = variant_early_gpio_table(&num_gpios); override_gpios = variant_early_override_gpio_table(&override_num_gpios); gpio_configure_pads_with_override(gpios, num_gpios, override_gpios, override_num_gpios); @@ -27,9 +24,6 @@ size_t num_gpios; uint32_t dword;
- if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) - return; - gpios = variant_espi_gpio_table(&num_gpios); gpio_configure_pads(gpios, num_gpios);
@@ -52,9 +46,6 @@ const struct soc_amd_gpio *gpios; size_t num_gpios;
- if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) - return; - gpios = variant_tpm_gpio_table(&num_gpios); gpio_configure_pads(gpios, num_gpios); }