Attention is currently required from: Jason Nien, Martin Roth.
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69176 )
Change subject: mb/google/guybrush: rename baseboard GPIO table getter for clarity ......................................................................
mb/google/guybrush: rename baseboard GPIO table getter for clarity
Rename variant_pcie_gpio_table() to baseboard_pcie_gpio_table(), since the GPIO table comes from the baseboard and is overridden by a separate table from the variant.
Drop the __weak qualifier as this function is not overridden.
This is similar to the change made for skyrim in CB:67809
Change-Id: I14c79fad04f18d874ce6ff7e572bb237445db8b1 Signed-off-by: Matt DeVillier matt.devillier@amd.corp-partner.google.com --- M src/mainboard/google/guybrush/romstage.c M src/mainboard/google/guybrush/variants/baseboard/gpio.c M src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h 3 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/69176/1
diff --git a/src/mainboard/google/guybrush/romstage.c b/src/mainboard/google/guybrush/romstage.c index 23e7853..0b7649b 100644 --- a/src/mainboard/google/guybrush/romstage.c +++ b/src/mainboard/google/guybrush/romstage.c @@ -9,7 +9,7 @@ const struct soc_amd_gpio *base_gpios, *override_gpios;
/* Initialize PCIe reset. */ - base_gpios = variant_pcie_gpio_table(&base_num_gpios); + base_gpios = baseboard_pcie_gpio_table(&base_num_gpios); override_gpios = variant_pcie_override_gpio_table(&override_num_gpios);
gpio_configure_pads_with_override(base_gpios, base_num_gpios, diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c index 8554c4c..1ee70da 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c +++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c @@ -286,7 +286,7 @@ PAD_NFO(GPIO_26, PCIE_RST_L, HIGH), };
-const struct soc_amd_gpio *__weak variant_pcie_gpio_table(size_t *size) +const struct soc_amd_gpio *baseboard_pcie_gpio_table(size_t *size) { *size = ARRAY_SIZE(pcie_gpio_table); return pcie_gpio_table; diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h index bf69443..9a57c41 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h @@ -30,7 +30,7 @@ const struct soc_amd_gpio *variant_bootblock_gpio_table(size_t *size);
/* This function provides GPIO settings before PCIe enumeration. */ -const struct soc_amd_gpio *variant_pcie_gpio_table(size_t *size); +const struct soc_amd_gpio *baseboard_pcie_gpio_table(size_t *size);
/* This function provides GPIO settings for eSPI bus. */ const struct soc_amd_gpio *variant_espi_gpio_table(size_t *size);