summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/guybrush/variants/guybrush/Makefile.inc2
-rw-r--r--src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc2
-rw-r--r--src/mainboard/google/guybrush/verstage.c9
3 files changed, 10 insertions, 3 deletions
diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
index d8a1beaf8f..dd3b775456 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
@@ -9,4 +9,6 @@ romstage-y += variant.c
ramstage-y += gpio.c
ramstage-y += variant.c
+verstage-y += gpio.c
+
subdirs-y += ./memory
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
index 03c9c8bac4..d147aa9a49 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
@@ -3,6 +3,8 @@
bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-y += gpio.c
+verstage-y += gpio.c
+
bootblock-y += variant.c
romstage-y += variant.c
ramstage-y += variant.c
diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c
index a8c162f59b..e6434dfda2 100644
--- a/src/mainboard/google/guybrush/verstage.c
+++ b/src/mainboard/google/guybrush/verstage.c
@@ -9,12 +9,15 @@
static void setup_gpio(void)
{
- const struct soc_amd_gpio *gpios;
- size_t num_gpios;
+ const struct soc_amd_gpio *gpios, *override_gpios;
+ size_t num_gpios, override_num_gpios;
if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) {
gpios = variant_early_gpio_table(&num_gpios);
- gpio_configure_pads(gpios, 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);
}
}