diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2022-03-10 10:18:57 -0700 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-03-14 15:48:57 +0000 |
| commit | b52b7010ef754eda9bad8f9eee5a499242e04a17 (patch) | |
| tree | 4756700c72ef1e96e171655bbf3d3b644e56dacf | |
| parent | 938f33e9f7756d730a1da278679087476a476bf2 (diff) | |
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>
| -rw-r--r-- | src/mainboard/google/guybrush/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/guybrush/verstage.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc index 56ef2b38b2..cdfb53bd63 100644 --- a/src/mainboard/google/guybrush/Makefile.inc +++ b/src/mainboard/google/guybrush/Makefile.inc @@ -12,7 +12,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c 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 35bfa0a1da..f827fddbb8 100644 --- a/src/mainboard/google/guybrush/verstage.c +++ b/src/mainboard/google/guybrush/verstage.c @@ -13,9 +13,6 @@ void verstage_mainboard_early_init(void) 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 @@ void verstage_mainboard_espi_init(void) 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 @@ void verstage_mainboard_tpm_init(void) 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); } |