Felix Held submitted this change.
mb/google/brya/var/taeko{4es}: Remove extraneous __weak attributes
Functions that are intended to override weak ones defined in the
baseboard should not also be declared weak, otherwise how would
the linker know which copy to keep.
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Change-Id: Ia2ceee77d00a5baa915fd1f306d76e79aa609e65
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63179
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M src/mainboard/google/brya/variants/taeko/memory.c
M src/mainboard/google/brya/variants/taeko4es/memory.c
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mainboard/google/brya/variants/taeko/memory.c b/src/mainboard/google/brya/variants/taeko/memory.c
index 9a7ef5c..e9e8533 100644
--- a/src/mainboard/google/brya/variants/taeko/memory.c
+++ b/src/mainboard/google/brya/variants/taeko/memory.c
@@ -66,12 +66,12 @@
.ect = 1, /* Enable Early Command Training */
};
-const struct mb_cfg *__weak variant_memory_params(void)
+const struct mb_cfg *variant_memory_params(void)
{
return &baseboard_memcfg;
}
-int __weak variant_memory_sku(void)
+int variant_memory_sku(void)
{
/*
* Memory configuration board straps
@@ -90,7 +90,7 @@
return gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios));
}
-bool __weak variant_is_half_populated(void)
+bool variant_is_half_populated(void)
{
/* GPIO_MEM_CH_SEL GPP_E13 */
return gpio_get(GPP_E13);
diff --git a/src/mainboard/google/brya/variants/taeko4es/memory.c b/src/mainboard/google/brya/variants/taeko4es/memory.c
index 9a7ef5c..e9e8533 100644
--- a/src/mainboard/google/brya/variants/taeko4es/memory.c
+++ b/src/mainboard/google/brya/variants/taeko4es/memory.c
@@ -66,12 +66,12 @@
.ect = 1, /* Enable Early Command Training */
};
-const struct mb_cfg *__weak variant_memory_params(void)
+const struct mb_cfg *variant_memory_params(void)
{
return &baseboard_memcfg;
}
-int __weak variant_memory_sku(void)
+int variant_memory_sku(void)
{
/*
* Memory configuration board straps
@@ -90,7 +90,7 @@
return gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios));
}
-bool __weak variant_is_half_populated(void)
+bool variant_is_half_populated(void)
{
/* GPIO_MEM_CH_SEL GPP_E13 */
return gpio_get(GPP_E13);
To view, visit change 63179. To unsubscribe, or for help writing mail filters, visit settings.