From 52a22fa7e68ba92c28f8ef4d53d6c30f0d23c48c Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 23 Sep 2022 13:24:39 -0500 Subject: [PATCH] mb/google/octopus: rename baseboard GPIO table getter for clarity Rename variant_base_gpio_table() to baseboard_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. Change-Id: I17db734784ce96cdf5e0486dc2ad057d73bfb15f Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/67804 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel --- src/mainboard/google/octopus/mainboard.c | 2 +- src/mainboard/google/octopus/variants/baseboard/gpio.c | 2 +- .../octopus/variants/baseboard/include/baseboard/variants.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index a614763bda..92b107479d 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -98,7 +98,7 @@ static void mainboard_init(void *chip_info) boardid = board_id(); printk(BIOS_INFO, "Board ID: %d\n", boardid); - base_pads = variant_base_gpio_table(&base_num); + base_pads = baseboard_gpio_table(&base_num); override_pads = variant_override_gpio_table(&override_num); gpio_modification_by_ssfc((struct pad_config *)override_pads, override_num); diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c index 76f74a560b..2238a9ffda 100644 --- a/src/mainboard/google/octopus/variants/baseboard/gpio.c +++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c @@ -275,7 +275,7 @@ static const struct pad_config gpio_table[] = { PAD_NC(GPIO_210, DN_20K), }; -const struct pad_config *__weak variant_base_gpio_table(size_t *num) +const struct pad_config *baseboard_gpio_table(size_t *num) { *num = ARRAY_SIZE(gpio_table); return gpio_table; diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h index bbc5d567e7..a1ee5d02ea 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h @@ -10,7 +10,7 @@ /* The next set of functions return the gpio table and fill in the number of * entries for each table. */ const struct pad_config *mainboard_early_bootblock_gpio_table(size_t *num); -const struct pad_config *variant_base_gpio_table(size_t *num); +const struct pad_config *baseboard_gpio_table(size_t *num); const struct pad_config *variant_override_gpio_table(size_t *num); const struct pad_config *variant_early_gpio_table(size_t *num); const struct pad_config *variant_early_override_gpio_table(size_t *num);