<p>Nick Vaccaro would like Nick Vaccaro to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/23033">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/zoombini: move gpio.c into variants/zoombini<br><br>BUG=b:64395641<br>BRANCH=None<br>TEST=Verify "./util/abuild/abuild -p none -t google/zoombini -x -a"<br>compiles successfully.<br><br>Change-Id: I1f3eccd7345c01a1f314ba51927b9bf5c8edeea3<br>Signed-off-by: Nick Vaccaro <nvaccaro@chromium.org><br>---<br>M src/mainboard/google/zoombini/variants/baseboard/Makefile.inc<br>A src/mainboard/google/zoombini/variants/zoombini/Makefile.inc<br>R src/mainboard/google/zoombini/variants/zoombini/gpio.c<br>3 files changed, 22 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/23033/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc b/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc</span><br><span>index 3385b4c..ee25895 100644</span><br><span>--- a/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc</span><br><span>+++ b/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc</span><br><span>@@ -13,9 +13,6 @@</span><br><span> ## GNU General Public License for more details.</span><br><span> ##</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> romstage-y += boardid.c</span><br><span> </span><br><span> ramstage-y += boardid.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += gpio.c</span><br><span>diff --git a/src/mainboard/google/zoombini/variants/zoombini/Makefile.inc b/src/mainboard/google/zoombini/variants/zoombini/Makefile.inc</span><br><span>new file mode 100644</span><br><span>index 0000000..8f03114</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/zoombini/variants/zoombini/Makefile.inc</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## Copyright 2017 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+## it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+## the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+## This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+## but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+## GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+##</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += gpio.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += gpio.c</span><br><span>diff --git a/src/mainboard/google/zoombini/variants/baseboard/gpio.c b/src/mainboard/google/zoombini/variants/zoombini/gpio.c</span><br><span>similarity index 94%</span><br><span>rename from src/mainboard/google/zoombini/variants/baseboard/gpio.c</span><br><span>rename to src/mainboard/google/zoombini/variants/zoombini/gpio.c</span><br><span>index 1626c38..e9cfb42 100644</span><br><span>--- a/src/mainboard/google/zoombini/variants/baseboard/gpio.c</span><br><span>+++ b/src/mainboard/google/zoombini/variants/zoombini/gpio.c</span><br><span>@@ -243,23 +243,16 @@</span><br><span> /* GSPI0_MOSI */ PAD_CFG_NF(GPP_B18, NONE, DEEP,</span><br><span> NF1), /* PCH_SPI_H1_3V3_MOSI */</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_ZOOMBINI_USE_I2C_TPM)</span><br><span style="color: hsl(0, 100%, 40%);">-/* I2C5_SDA */</span><br><span style="color: hsl(0, 100%, 40%);">-/* I2C5_SCL */</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-/* Ensure UART pins are in native mode for H1. */</span><br><span style="color: hsl(0, 100%, 40%);">-/* UART0_RXD */ /* UART_PCH_RX_DEBUG_TX */</span><br><span style="color: hsl(0, 100%, 40%);">-/* UART0_TXD */ /* UART_PCH_RX_DEBUG_RX */</span><br><span style="color: hsl(120, 100%, 40%);">+/* UART1_RXD */ PAD_CFG_GPI(GPP_C12, NONE, DEEP), /* H1_PCH_INT_ODL */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *__attribute__((weak)) variant_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_gpio_table(size_t *num)</span><br><span> {</span><br><span> *num = ARRAY_SIZE(gpio_table);</span><br><span> return gpio_table;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *__attribute__((weak))</span><br><span style="color: hsl(0, 100%, 40%);">- variant_early_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_early_gpio_table(size_t *num)</span><br><span> {</span><br><span> *num = ARRAY_SIZE(early_gpio_table);</span><br><span> return early_gpio_table;</span><br><span>@@ -269,7 +262,7 @@</span><br><span> CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct cros_gpio *__attribute__((weak)) variant_cros_gpios(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct cros_gpio *variant_cros_gpios(size_t *num)</span><br><span> {</span><br><span> *num = ARRAY_SIZE(cros_gpios);</span><br><span> return cros_gpios;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23033">change 23033</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/23033"/><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: I1f3eccd7345c01a1f314ba51927b9bf5c8edeea3 </div>
<div style="display:none"> Gerrit-Change-Number: 23033 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nick Vaccaro <nvaccaro@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Nick Vaccaro <nvaccaro@chromium.org> </div>