<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28630">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/asrock/g41c-gs: Link separate gpio.c files<br><br>With the addition of new boards using macros to set per board settings in the<br>same gpio.c file is getting too complicated so link separate files.<br><br>Change-Id: I3ab05f1af6ba0a04dd827816b3bcaa506a3f6aff<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/mainboard/asrock/g41c-gs/Kconfig<br>M src/mainboard/asrock/g41c-gs/Makefile.inc<br>C src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/gpio.c<br>C src/mainboard/asrock/g41c-gs/variants/g41c-gs/gpio.c<br>R src/mainboard/asrock/g41c-gs/variants/g41m-gs/gpio.c<br>5 files changed, 7 insertions(+), 88 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/28630/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig</span><br><span>index ad2fe22..f9dddfd 100644</span><br><span>--- a/src/mainboard/asrock/g41c-gs/Kconfig</span><br><span>+++ b/src/mainboard/asrock/g41c-gs/Kconfig</span><br><span>@@ -41,6 +41,12 @@</span><br><span> string</span><br><span> default "asrock/g41c-gs"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config VARIANT_DIR</span><br><span style="color: hsl(120, 100%, 40%);">+ string</span><br><span style="color: hsl(120, 100%, 40%);">+ default "g41c_gs_r2" if BOARD_ASROCK_G41C_GS_R2_0</span><br><span style="color: hsl(120, 100%, 40%);">+ default "g41c-gs" if BOARD_ASROCK_G41C_GS</span><br><span style="color: hsl(120, 100%, 40%);">+ default "g41m-gs" if BOARD_ASROCK_G41M_GS</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config MAINBOARD_PART_NUMBER</span><br><span> string</span><br><span> default "G41C-GS R2.0" if BOARD_ASROCK_G41C_GS_R2_0</span><br><span>diff --git a/src/mainboard/asrock/g41c-gs/Makefile.inc b/src/mainboard/asrock/g41c-gs/Makefile.inc</span><br><span>index 0786d6f..82e72fb 100644</span><br><span>--- a/src/mainboard/asrock/g41c-gs/Makefile.inc</span><br><span>+++ b/src/mainboard/asrock/g41c-gs/Makefile.inc</span><br><span>@@ -1,4 +1,4 @@</span><br><span> ramstage-y += cstates.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += gpio.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += variants/$(VARIANT_DIR)/gpio.c</span><br><span> </span><br><span> ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads</span><br><span>diff --git a/src/mainboard/asrock/g41c-gs/gpio.c b/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/gpio.c</span><br><span>similarity index 79%</span><br><span>copy from src/mainboard/asrock/g41c-gs/gpio.c</span><br><span>copy to src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/gpio.c</span><br><span>index b6ccbad..6299d62 100644</span><br><span>--- a/src/mainboard/asrock/g41c-gs/gpio.c</span><br><span>+++ b/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/gpio.c</span><br><span>@@ -45,27 +45,18 @@</span><br><span> .gpio10 = GPIO_DIR_OUTPUT,</span><br><span> .gpio12 = GPIO_DIR_INPUT,</span><br><span> .gpio13 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio14 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> .gpio14 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio15 = GPIO_DIR_OUTPUT,</span><br><span> .gpio16 = GPIO_DIR_OUTPUT,</span><br><span> .gpio18 = GPIO_DIR_OUTPUT,</span><br><span> .gpio20 = GPIO_DIR_OUTPUT,</span><br><span> .gpio24 = GPIO_DIR_OUTPUT,</span><br><span> .gpio25 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio26 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> .gpio26 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio27 = GPIO_DIR_OUTPUT,</span><br><span> .gpio28 = GPIO_DIR_INPUT,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41C_GS_R2_0)</span><br><span> static const struct pch_gpio_set1 pch_gpio_set1_level = {</span><br><span> .gpio10 = GPIO_LEVEL_LOW,</span><br><span> .gpio15 = GPIO_LEVEL_LOW,</span><br><span>@@ -76,31 +67,10 @@</span><br><span> .gpio25 = GPIO_LEVEL_LOW,</span><br><span> .gpio27 = GPIO_LEVEL_LOW,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-#else /* BOARD_ASROCK_G41C_GS, BOARD_ASROCK_G41M_GS*/</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pch_gpio_set1 pch_gpio_set1_level = {</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio10 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio14 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio15 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio16 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio18 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio20 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio24 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio25 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio26 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio27 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> static const struct pch_gpio_set1 pch_gpio_set1_invert = {</span><br><span> .gpio0 = GPIO_INVERT,</span><br><span> .gpio6 = GPIO_INVERT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio8 = GPIO_INVERT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio12 = GPIO_INVERT,</span><br><span> .gpio13 = GPIO_INVERT,</span><br><span> };</span><br><span>diff --git a/src/mainboard/asrock/g41c-gs/gpio.c b/src/mainboard/asrock/g41c-gs/variants/g41c-gs/gpio.c</span><br><span>similarity index 79%</span><br><span>copy from src/mainboard/asrock/g41c-gs/gpio.c</span><br><span>copy to src/mainboard/asrock/g41c-gs/variants/g41c-gs/gpio.c</span><br><span>index b6ccbad..52cd611 100644</span><br><span>--- a/src/mainboard/asrock/g41c-gs/gpio.c</span><br><span>+++ b/src/mainboard/asrock/g41c-gs/variants/g41c-gs/gpio.c</span><br><span>@@ -45,62 +45,32 @@</span><br><span> .gpio10 = GPIO_DIR_OUTPUT,</span><br><span> .gpio12 = GPIO_DIR_INPUT,</span><br><span> .gpio13 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio14 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> .gpio14 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio15 = GPIO_DIR_OUTPUT,</span><br><span> .gpio16 = GPIO_DIR_OUTPUT,</span><br><span> .gpio18 = GPIO_DIR_OUTPUT,</span><br><span> .gpio20 = GPIO_DIR_OUTPUT,</span><br><span> .gpio24 = GPIO_DIR_OUTPUT,</span><br><span> .gpio25 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio26 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> .gpio26 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio27 = GPIO_DIR_OUTPUT,</span><br><span> .gpio28 = GPIO_DIR_INPUT,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41C_GS_R2_0)</span><br><span> static const struct pch_gpio_set1 pch_gpio_set1_level = {</span><br><span> .gpio10 = GPIO_LEVEL_LOW,</span><br><span> .gpio15 = GPIO_LEVEL_LOW,</span><br><span> .gpio16 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio18 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio20 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio24 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio25 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio27 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-#else /* BOARD_ASROCK_G41C_GS, BOARD_ASROCK_G41M_GS*/</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pch_gpio_set1 pch_gpio_set1_level = {</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio10 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio14 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio15 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio16 = GPIO_LEVEL_HIGH,</span><br><span> .gpio18 = GPIO_LEVEL_LOW,</span><br><span> .gpio20 = GPIO_LEVEL_HIGH,</span><br><span> .gpio24 = GPIO_LEVEL_HIGH,</span><br><span> .gpio25 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio26 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio27 = GPIO_LEVEL_LOW,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> static const struct pch_gpio_set1 pch_gpio_set1_invert = {</span><br><span> .gpio0 = GPIO_INVERT,</span><br><span> .gpio6 = GPIO_INVERT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio8 = GPIO_INVERT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio12 = GPIO_INVERT,</span><br><span> .gpio13 = GPIO_INVERT,</span><br><span> };</span><br><span>diff --git a/src/mainboard/asrock/g41c-gs/gpio.c b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/gpio.c</span><br><span>similarity index 81%</span><br><span>rename from src/mainboard/asrock/g41c-gs/gpio.c</span><br><span>rename to src/mainboard/asrock/g41c-gs/variants/g41m-gs/gpio.c</span><br><span>index b6ccbad..cea01cf 100644</span><br><span>--- a/src/mainboard/asrock/g41c-gs/gpio.c</span><br><span>+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/gpio.c</span><br><span>@@ -45,62 +45,35 @@</span><br><span> .gpio10 = GPIO_DIR_OUTPUT,</span><br><span> .gpio12 = GPIO_DIR_INPUT,</span><br><span> .gpio13 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span> .gpio14 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio14 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio15 = GPIO_DIR_OUTPUT,</span><br><span> .gpio16 = GPIO_DIR_OUTPUT,</span><br><span> .gpio18 = GPIO_DIR_OUTPUT,</span><br><span> .gpio20 = GPIO_DIR_OUTPUT,</span><br><span> .gpio24 = GPIO_DIR_OUTPUT,</span><br><span> .gpio25 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span> .gpio26 = GPIO_DIR_OUTPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio26 = GPIO_DIR_INPUT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio27 = GPIO_DIR_OUTPUT,</span><br><span> .gpio28 = GPIO_DIR_INPUT,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41C_GS_R2_0)</span><br><span> static const struct pch_gpio_set1 pch_gpio_set1_level = {</span><br><span> .gpio10 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio15 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio16 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio18 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio20 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio24 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio25 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio27 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-#else /* BOARD_ASROCK_G41C_GS, BOARD_ASROCK_G41M_GS*/</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pch_gpio_set1 pch_gpio_set1_level = {</span><br><span style="color: hsl(0, 100%, 40%);">- .gpio10 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span> .gpio14 = GPIO_LEVEL_HIGH,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio15 = GPIO_LEVEL_LOW,</span><br><span> .gpio16 = GPIO_LEVEL_HIGH,</span><br><span> .gpio18 = GPIO_LEVEL_LOW,</span><br><span> .gpio20 = GPIO_LEVEL_HIGH,</span><br><span> .gpio24 = GPIO_LEVEL_HIGH,</span><br><span> .gpio25 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span> .gpio26 = GPIO_LEVEL_LOW,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio27 = GPIO_LEVEL_LOW,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> static const struct pch_gpio_set1 pch_gpio_set1_invert = {</span><br><span> .gpio0 = GPIO_INVERT,</span><br><span> .gpio6 = GPIO_INVERT,</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_BOARD_ASROCK_G41M_GS)</span><br><span> .gpio8 = GPIO_INVERT,</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> .gpio12 = GPIO_INVERT,</span><br><span> .gpio13 = GPIO_INVERT,</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28630">change 28630</a>. To unsubscribe, or for help writing mail filters, 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/28630"/><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: I3ab05f1af6ba0a04dd827816b3bcaa506a3f6aff </div>
<div style="display:none"> Gerrit-Change-Number: 28630 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>