<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22435">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/kahlee: Add getter function for GPIO array<br><br>Instead of getting the address of the GPIO function with an extern,<br>add a getter function and make the GPIO arrays static.<br><br>TEST=Build Grunt; Build & boot Kahlee<br>BUG=b:69164070<br><br>Change-Id: I3defcb66696459b915d7d4f43234d5c08ab7d417<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/BiosCallOuts.c<br>M src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>4 files changed, 17 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/22435/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c<br>index f26b54e..2f6a603 100644<br>--- a/src/mainboard/google/kahlee/BiosCallOuts.c<br>+++ b/src/mainboard/google/kahlee/BiosCallOuts.c<br>@@ -18,17 +18,16 @@<br> #include <FchPlatform.h><br> #include <soc/southbridge.h><br> #include <stdlib.h><br>-<br>-extern const GPIO_CONTROL agesa_board_gpios[];<br>+#include <baseboard/variants.h><br> <br> void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset)<br> {<br>-    FchParams_reset->EarlyOemGpioTable = (void *)agesa_board_gpios;<br>+   FchParams_reset->EarlyOemGpioTable = (void *)get_gpio_table();<br> }<br> <br> void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env)<br> {<br>-    FchParams_env->PostOemGpioTable = (void *)agesa_board_gpios;<br>+      FchParams_env->PostOemGpioTable = (void *)get_gpio_table();<br> <br>     /* SDHCI/MMC configuration */<br>         if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KAHLEE))<br>diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>index 84e40b0..aca96c4 100644<br>--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>@@ -20,10 +20,15 @@<br> #include <soc/southbridge.h><br> #include <stdlib.h><br> <br>-const GPIO_CONTROL __attribute__((weak)) agesa_board_gpios[] = {<br>+static const GPIO_CONTROL agesa_board_gpios[] = {<br> <br> };<br> <br>+const __attribute__((weak)) GPIO_CONTROL *get_gpio_table(void)<br>+{<br>+     return agesa_board_gpios;<br>+}<br>+<br> /*<br>  * GPE setup table must match ACPI GPE ASL<br>  *  { gevent, gpe, direction, level }<br>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>index 0a57808..aad5607 100644<br>--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>@@ -19,7 +19,9 @@<br> <br> #include <stddef.h><br> #include <soc/smi.h><br>+#include <AGESA.h><br> <br>+const GPIO_CONTROL *get_gpio_table(void);<br> const struct sci_source *get_gpe_table(size_t *num);<br> size_t variant_board_id(void);<br> <br>diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>index 3e981f5..0fd5f40 100644<br>--- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>+++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>@@ -21,7 +21,7 @@<br> #include <stdlib.h><br> #include <variant/gpio.h><br> <br>-const GPIO_CONTROL agesa_board_gpios[] = {<br>+static const GPIO_CONTROL agesa_board_gpios[] = {<br>     /* AGPIO2 PCIE/WLAN WAKE# SCI*/<br>       {2, Function1, FCH_GPIO_PULL_UP_ENABLE },<br> <br>@@ -100,6 +100,11 @@<br>    {-1}<br> };<br> <br>+const GPIO_CONTROL *get_gpio_table(void)<br>+{<br>+  return agesa_board_gpios;<br>+}<br>+<br> /*<br>  * GPE setup table must match ACPI GPE ASL<br>  *  { gevent, gpe, direction, level }<br></pre><p>To view, visit <a href="https://review.coreboot.org/22435">change 22435</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22435"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3defcb66696459b915d7d4f43234d5c08ab7d417 </div>
<div style="display:none"> Gerrit-Change-Number: 22435 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>