Change in coreboot[master]: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions

[Werner Zeh (Code Review)]

Werner Zeh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36094 )

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions

The two GPIO functions variant_gpio_table() and
variant_early_gpio_table() provide the pointer to the variants GPIO
table for late and early GPIO init. As these functions are variant
dependent the keyword __weak must not be used as otherwise the linker
might choose the tables from the baseboard.
This patch removes the __weak definition making these functions
overriding the general ones in baseboard/gpio.c.

Change-Id: Ic7fc816d40cb112d7ab51089c3962a77798c08a8
Signed-off-by: Werner Zeh 
---
M src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
M src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
2 files changed, 4 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/36094/1

diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
index e0fec7c..7401c74 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
@@ -363,7 +363,7 @@
    PAD_CFG_NF(SVID0_CLK, UP_20K, DEEP, NF1),	/* SVID0_CLK */
 };

-const struct pad_config *__weak variant_gpio_table(size_t *num)
+const struct pad_config *variant_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(gpio_table);
    return gpio_table;
@@ -406,8 +406,7 @@
    PAD_CFG_NF(LPC_FRAMEB, NONE, DEEP, NF1),	/* LPC_FRAME_N */
 };

-const struct pad_config *__weak
-variant_early_gpio_table(size_t *num)
+const struct pad_config *variant_early_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(early_gpio_table);
    return early_gpio_table;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
index f6578cb..3edf14f 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
@@ -363,7 +363,7 @@
    PAD_CFG_NF(SVID0_CLK, UP_20K, DEEP, NF1),	/* SVID0_CLK */
 };

-const struct pad_config *__weak variant_gpio_table(size_t *num)
+const struct pad_config *variant_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(gpio_table);
    return gpio_table;
@@ -409,8 +409,7 @@
    PAD_CFG_GPO(PMIC_STDBY, 0, DEEP),
 };

-const struct pad_config *__weak
-variant_early_gpio_table(size_t *num)
+const struct pad_config *variant_early_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(early_gpio_table);
    return early_gpio_table;

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36094 )

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

Patch Set 1: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36094 )

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

Patch Set 1: Code-Review+1

(2 comments)

https://review.coreboot.org/c/coreboot/+/36094/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/36094/1//COMMIT_MSG@13 
PS1, Line 13: might choose the tables from the baseboard.
Was this the case here, or is it just for correctness sake?

https://review.coreboot.org/c/coreboot/+/36094/1//COMMIT_MSG@14 
PS1, Line 14: This patch removes the __weak definition making these functions
Please add a blank line between paragraphs.

[Werner Zeh (Code Review)]

Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36094 )

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

Patch Set 1:

(2 comments)

https://review.coreboot.org/c/coreboot/+/36094/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/36094/1//COMMIT_MSG@13 
PS1, Line 13: might choose the tables from the baseboard.
> Was this the case here, or is it just for correctness sake?

It was the case for mc_apl3 and mc_apl5.

https://review.coreboot.org/c/coreboot/+/36094/1//COMMIT_MSG@14 
PS1, Line 14: This patch removes the __weak definition making these functions
> Please add a blank line between paragraphs.

Will do.

[Werner Zeh (Code Review)]

Hello Kyösti Mälkki, Paul Menzel, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/36094

to look at the new patch set (#2).

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions

The two GPIO functions variant_gpio_table() and
variant_early_gpio_table() provide the pointer to the variants GPIO
table for late and early GPIO init. As these functions are variant
dependent the keyword __weak must not be used as otherwise the linker
might choose the tables from the baseboard.

This patch removes the __weak definition making these functions
overriding the general ones in baseboard/gpio.c.

Change-Id: Ic7fc816d40cb112d7ab51089c3962a77798c08a8
Signed-off-by: Werner Zeh 
---
M src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
M src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
2 files changed, 4 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/36094/2

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36094 )

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

Patch Set 2: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36094 )

Change subject: mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions
......................................................................

mb/siemens/mc_apl{3,5}: Remove __weak symbol from GPIO functions

The two GPIO functions variant_gpio_table() and
variant_early_gpio_table() provide the pointer to the variants GPIO
table for late and early GPIO init. As these functions are variant
dependent the keyword __weak must not be used as otherwise the linker
might choose the tables from the baseboard.

This patch removes the __weak definition making these functions
overriding the general ones in baseboard/gpio.c.

Change-Id: Ic7fc816d40cb112d7ab51089c3962a77798c08a8
Signed-off-by: Werner Zeh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36094
Reviewed-by: Patrick Georgi 
Reviewed-by: Kyösti Mälkki 
Reviewed-by: Paul Menzel 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
M src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
2 files changed, 4 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  Kyösti Mälkki: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve

diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
index e0fec7c..7401c74 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/gpio.c
@@ -363,7 +363,7 @@
    PAD_CFG_NF(SVID0_CLK, UP_20K, DEEP, NF1),	/* SVID0_CLK */
 };

-const struct pad_config *__weak variant_gpio_table(size_t *num)
+const struct pad_config *variant_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(gpio_table);
    return gpio_table;
@@ -406,8 +406,7 @@
    PAD_CFG_NF(LPC_FRAMEB, NONE, DEEP, NF1),	/* LPC_FRAME_N */
 };

-const struct pad_config *__weak
-variant_early_gpio_table(size_t *num)
+const struct pad_config *variant_early_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(early_gpio_table);
    return early_gpio_table;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
index f6578cb..3edf14f 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/gpio.c
@@ -363,7 +363,7 @@
    PAD_CFG_NF(SVID0_CLK, UP_20K, DEEP, NF1),	/* SVID0_CLK */
 };

-const struct pad_config *__weak variant_gpio_table(size_t *num)
+const struct pad_config *variant_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(gpio_table);
    return gpio_table;
@@ -409,8 +409,7 @@
    PAD_CFG_GPO(PMIC_STDBY, 0, DEEP),
 };

-const struct pad_config *__weak
-variant_early_gpio_table(size_t *num)
+const struct pad_config *variant_early_gpio_table(size_t *num)
 {
    *num = ARRAY_SIZE(early_gpio_table);
    return early_gpio_table;