Nick Vaccaro would like Nick Vaccaro to review this change.

View Change

mainboard/google/zoombini: move gpio.c into variants/zoombini

BUG=b:64395641
BRANCH=None
TEST=Verify "./util/abuild/abuild -p none -t google/zoombini -x -a"
compiles successfully.

Change-Id: I1f3eccd7345c01a1f314ba51927b9bf5c8edeea3
Signed-off-by: Nick Vaccaro <nvaccaro@chromium.org>
---
M src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
A src/mainboard/google/zoombini/variants/zoombini/Makefile.inc
R src/mainboard/google/zoombini/variants/zoombini/gpio.c
3 files changed, 22 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/23033/1

diff --git a/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc b/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
index 3385b4c..ee25895 100644
--- a/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/zoombini/variants/baseboard/Makefile.inc
@@ -13,9 +13,6 @@
 ## GNU General Public License for more details.
 ##
 
-bootblock-y += gpio.c
-
 romstage-y += boardid.c
 
 ramstage-y += boardid.c
-ramstage-y += gpio.c
diff --git a/src/mainboard/google/zoombini/variants/zoombini/Makefile.inc b/src/mainboard/google/zoombini/variants/zoombini/Makefile.inc
new file mode 100644
index 0000000..8f03114
--- /dev/null
+++ b/src/mainboard/google/zoombini/variants/zoombini/Makefile.inc
@@ -0,0 +1,18 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright 2017 Google Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+bootblock-y += gpio.c
+
+ramstage-y += gpio.c
diff --git a/src/mainboard/google/zoombini/variants/baseboard/gpio.c b/src/mainboard/google/zoombini/variants/zoombini/gpio.c
similarity index 94%
rename from src/mainboard/google/zoombini/variants/baseboard/gpio.c
rename to src/mainboard/google/zoombini/variants/zoombini/gpio.c
index 1626c38..e9cfb42 100644
--- a/src/mainboard/google/zoombini/variants/baseboard/gpio.c
+++ b/src/mainboard/google/zoombini/variants/zoombini/gpio.c
@@ -243,23 +243,16 @@
 /* GSPI0_MOSI */	PAD_CFG_NF(GPP_B18, NONE, DEEP,
 				   NF1), /* PCH_SPI_H1_3V3_MOSI */
 #endif
-#if IS_ENABLED(CONFIG_ZOOMBINI_USE_I2C_TPM)
-/* I2C5_SDA */
-/* I2C5_SCL */
-#endif
-/* Ensure UART pins are in native mode for H1. */
-/* UART0_RXD */		/* UART_PCH_RX_DEBUG_TX */
-/* UART0_TXD */		/* UART_PCH_RX_DEBUG_RX */
+/* UART1_RXD */		PAD_CFG_GPI(GPP_C12, NONE, DEEP), /* H1_PCH_INT_ODL */
 };
 
-const struct pad_config *__attribute__((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;
 }
 
-const struct pad_config *__attribute__((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;
@@ -269,7 +262,7 @@
 	CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME),
 };
 
-const struct cros_gpio *__attribute__((weak)) variant_cros_gpios(size_t *num)
+const struct cros_gpio *variant_cros_gpios(size_t *num)
 {
 	*num = ARRAY_SIZE(cros_gpios);
 	return cros_gpios;

To view, visit change 23033. To unsubscribe, or for help writing mail filters, visit settings.