sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/guybrush: Fix building with VBOOT_STARTS_IN_BOOTBLOCK

Browse Source 
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>
This commit is contained in:
Raul E Rangel
2022-03-10 10:18:57 -07:00
committed by Felix Held
parent 938f33e9f7
commit b52b7010ef
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/google/guybrush/Makefile.inc
View File

@@ -12,7 +12,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
all-y += spi_speeds.c all-y += spi_speeds.c
verstage-y += verstage.c verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c verstage-$(CONFIG_CHROMEOS) += chromeos.c
subdirs-y += variants/baseboard subdirs-y += variants/baseboard

9
src/mainboard/google/guybrush/verstage.c
View File

@@ -13,9 +13,6 @@ void verstage_mainboard_early_init(void)
const struct soc_amd_gpio *gpios, *override_gpios; const struct soc_amd_gpio *gpios, *override_gpios;
size_t num_gpios, override_num_gpios; size_t num_gpios, override_num_gpios;
if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK))
return;
gpios = variant_early_gpio_table(&num_gpios); gpios = variant_early_gpio_table(&num_gpios);
override_gpios = variant_early_override_gpio_table(&override_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); 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; size_t num_gpios;
uint32_t dword; uint32_t dword;
if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK))
return;
gpios = variant_espi_gpio_table(&num_gpios); gpios = variant_espi_gpio_table(&num_gpios);
gpio_configure_pads(gpios, num_gpios); gpio_configure_pads(gpios, num_gpios);
@@ -52,9 +46,6 @@ void verstage_mainboard_tpm_init(void)
const struct soc_amd_gpio *gpios; const struct soc_amd_gpio *gpios;
size_t num_gpios; size_t num_gpios;
if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK))
return;
gpios = variant_tpm_gpio_table(&num_gpios); gpios = variant_tpm_gpio_table(&num_gpios);
gpio_configure_pads(gpios, num_gpios); gpio_configure_pads(gpios, num_gpios);
} }