mb/google/kahlee: rename baseboard GPIO table getter for clarity

Rename variant_romstage_gpio_table() to baseboard_romstage_gpio_table()
since the GPIO table comes from the baseboard (and is not overridden by
any variant).

Drop the __weak qualifier as this function is not overridden.

This mirrors similar changes made for skyrim, guybrush, and zork.

Change-Id: I772bd2d74fd6778ffaa1e0809cc53f8d43b153f3
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69546
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/src/mainboard/google/kahlee/romstage.c b/src/mainboard/google/kahlee/romstage.c
index c16b1d2c02..4b2fc9ab15 100644
--- a/src/mainboard/google/kahlee/romstage.c
+++ b/src/mainboard/google/kahlee/romstage.c
@@ -20,7 +20,7 @@ void mainboard_romstage_entry(void)
 	size_t num_gpios;
 	const struct soc_amd_gpio *gpios;
 
-	gpios = variant_romstage_gpio_table(&num_gpios);
+	gpios = baseboard_romstage_gpio_table(&num_gpios);
 	gpio_configure_pads(gpios, num_gpios);
 
 	variant_romstage_entry();
diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
index 3acf70f458..d421e7d212 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
@@ -254,8 +254,8 @@ struct soc_amd_gpio *variant_wlan_rst_early_gpio_table(size_t *size)
 	return gpio_wlan_rst_early_reset;
 }
 
-const __weak
-struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size)
+const
+struct soc_amd_gpio *baseboard_romstage_gpio_table(size_t *size)
 {
 	*size = ARRAY_SIZE(gpio_set_stage_rom);
 	return gpio_set_stage_rom;
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
index 22cc9e0a54..648698df42 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
@@ -14,7 +14,7 @@ int variant_get_xhci_oc_map(uint16_t *usb_oc_map);
 int variant_get_ehci_oc_map(uint16_t *usb_oc_map);
 const struct soc_amd_gpio *variant_early_gpio_table(size_t *size);
 const struct soc_amd_gpio *variant_wlan_rst_early_gpio_table(size_t *size);
-const struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size);
+const struct soc_amd_gpio *baseboard_romstage_gpio_table(size_t *size);
 const struct soc_amd_gpio *variant_gpio_table(size_t *size);
 void variant_romstage_entry(void);
 void variant_mainboard_suspend_resume(void);