diff options
4 files changed, 7 insertions, 13 deletions
diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c index 05e948e78003..82e5c6aaad58 100644 --- a/src/mainboard/google/zork/mainboard.c +++ b/src/mainboard/google/zork/mainboard.c @@ -112,7 +112,7 @@ static void mainboard_configure_gpios(void) size_t base_num_gpios, override_num_gpios; const struct soc_amd_gpio *base_gpios, *override_gpios; - base_gpios = variant_base_gpio_table(&base_num_gpios); + base_gpios = baseboard_gpio_table(&base_num_gpios); override_gpios = variant_override_gpio_table(&override_num_gpios); gpio_configure_pads_with_override(base_gpios, base_num_gpios, override_gpios, diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index ffcfb2539ab0..6dc3595d630a 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -160,8 +160,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { PAD_GPO(GPIO_144, LOW), }; -const __weak -struct soc_amd_gpio *variant_base_gpio_table(size_t *size) +const struct soc_amd_gpio *baseboard_gpio_table(size_t *size) { *size = ARRAY_SIZE(gpio_set_stage_ram); return gpio_set_stage_ram; diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index ae1252db0bfd..8d264c84768c 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -172,8 +172,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { PAD_GPO(GPIO_144, LOW), }; -const __weak -struct soc_amd_gpio *variant_base_gpio_table(size_t *size) +const struct soc_amd_gpio *baseboard_gpio_table(size_t *size) { *size = ARRAY_SIZE(gpio_set_stage_ram); return gpio_set_stage_ram; diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h index 09d5786b14cf..11926d102e23 100644 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h @@ -11,16 +11,12 @@ #include <soc/platform_descriptors.h> const struct soc_amd_gpio *variant_early_gpio_table(size_t *size); -/* - * This function provides base GPIO configuration table. It is typically provided by - * baseboard using a weak implementation. If GPIO configuration for a variant differs - * significantly from the baseboard, then the variant can also provide a strong implementation - * of this function. - */ -const struct soc_amd_gpio *variant_base_gpio_table(size_t *size); + +/* This function provides base GPIO configuration table. */ +const struct soc_amd_gpio *baseboard_gpio_table(size_t *size); /* * This function allows variant to override any GPIOs that are different than the base GPIO - * configuration provided by variant_base_gpio_table(). + * configuration provided by baseboard_gpio_table(). */ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size); |