mainboard/google/poppy: Add variant API for board_id and gpio

Provide APIs for board_id() and gpio table functionality. Default weak
implementations are provided from the baseboard.

BUG=b:37375693

Change-Id: Ic3c946e6cb12b3c8ef3e83a1037ed0fc8cffbded
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19323
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

8 files changed, 465 insertions, 370 deletions

diff --git a/src/mainboard/google/poppy/boardid.c b/src/mainboard/google/poppy/boardid.c
index e33c094a2d..4607f34453 100644
--- a/src/mainboard/google/poppy/boardid.c
+++ b/src/mainboard/google/poppy/boardid.c
@@ -13,15 +13,16 @@
  * GNU General Public License for more details.
  */
 
+#include <baseboard/variants.h>
 #include <boardid.h>
-#include <ec/google/chromeec/ec.h>
+#include <stddef.h>
 
 uint8_t board_id(void)
 {
 	MAYBE_STATIC int id = -1;
 
 	if (id < 0)
-		id = google_chromeec_get_board_version();
+		id = variant_board_id();
 
 	return id;
 }
diff --git a/src/mainboard/google/poppy/bootblock.c b/src/mainboard/google/poppy/bootblock.c
index 7057916c68..b82a8053d5 100644
--- a/src/mainboard/google/poppy/bootblock.c
+++ b/src/mainboard/google/poppy/bootblock.c
@@ -13,17 +13,17 @@
  * GNU General Public License for more details.
  */
 
+#include <baseboard/variants.h>
 #include <bootblock_common.h>
 #include <soc/gpio.h>
 
 #include <variant/gpio.h>
 
-static void early_config_gpio(void)
-{
-	gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
-}
-
 void bootblock_mainboard_init(void)
 {
-	early_config_gpio();
+	const struct pad_config *pads;
+	size_t num;
+
+	pads = variant_early_gpio_table(&num);
+	gpio_configure_pads(pads, num);
 }
diff --git a/src/mainboard/google/poppy/ramstage.c b/src/mainboard/google/poppy/ramstage.c
index b2c0ed7df1..39df3eeb85 100644
--- a/src/mainboard/google/poppy/ramstage.c
+++ b/src/mainboard/google/poppy/ramstage.c
@@ -13,11 +13,16 @@
  * GNU General Public License for more details.
  */
 
+#include <baseboard/variants.h>
 #include <soc/ramstage.h>
 
 #include <variant/gpio.h>
 
 void mainboard_silicon_init_params(FSP_SIL_UPD *params)
 {
-	gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
+	const struct pad_config *pads;
+	size_t num;
+
+	pads = variant_gpio_table(&num);
+	gpio_configure_pads(pads, num);
 }
diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc
new file mode 100644
index 0000000000..37a60a41a5
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc
@@ -0,0 +1,6 @@
+bootblock-y += gpio.c
+
+romstage-y += boardid.c
+
+ramstage-y += boardid.c
+ramstage-y += gpio.c
diff --git a/src/mainboard/google/poppy/variants/baseboard/boardid.c b/src/mainboard/google/poppy/variants/baseboard/boardid.c
new file mode 100644
index 0000000000..1cb084ac50
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/baseboard/boardid.c
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+#include <baseboard/variants.h>
+#include <ec/google/chromeec/ec.h>
+
+uint8_t __attribute__((weak)) variant_board_id(void)
+{
+	return google_chromeec_get_board_version();
+}
diff --git a/src/mainboard/google/poppy/variants/baseboard/gpio.c b/src/mainboard/google/poppy/variants/baseboard/gpio.c
new file mode 100644
index 0000000000..c08c8f6df1
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/baseboard/gpio.c
@@ -0,0 +1,389 @@
+/*
+ * 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.
+ */
+
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <commonlib/helpers.h>
+
+/* Pad configuration in ramstage */
+/* Leave eSPI pins untouched from default settings */
+static const struct pad_config gpio_table[] = {
+	/* A0  : RCIN# ==> NC(TP41) */
+	PAD_CFG_NC(GPP_A0),
+	/* A1  : ESPI_IO0 */
+	/* A2  : ESPI_IO1 */
+	/* A3  : ESPI_IO2 */
+	/* A4  : ESPI_IO3 */
+	/* A5  : ESPI_CS# */
+	/* A6  : SERIRQ ==> NC(TP44) */
+	PAD_CFG_NC(GPP_A6),
+	/* A7  : PIRQA# ==> NC */
+	PAD_CFG_NC(GPP_A7),
+	/* A8  : CLKRUN# ==> NC(TP45) */
+	PAD_CFG_NC(GPP_A8),
+	/* A9  : ESPI_CLK */
+	/* A10 : CLKOUT_LPC1 ==> NC */
+	PAD_CFG_NC(GPP_A10),
+	/* A11 : PME# ==> NC(TP67) */
+	PAD_CFG_NC(GPP_A11),
+	/* A12 : BM_BUSY# ==> NC */
+	PAD_CFG_NC(GPP_A12),
+	/* A13 : SUSWARN# ==> NC */
+	PAD_CFG_NC(GPP_A13),
+	/* A14 : ESPI_RESET# */
+	/* A15 : SUSACK# ==> SUSACK_L */
+	PAD_CFG_NF(GPP_A15, NONE, DEEP, NF1),
+	/* A16 : SD_1P8_SEL ==> SD_PWR_1800_SEL */
+	PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1),
+	/* A17 : SD_PWR_EN# ==> EN_SD_SOCKET_PWR_L */
+	PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1),
+	/* A18 : ISH_GP0 ==> NC */
+	PAD_CFG_NC(GPP_A18),
+	/* A19 : ISH_GP1 ==> NC */
+	PAD_CFG_NC(GPP_A19),
+	/* A20 : ISH_GP2 ==> ACCEL_GYRO_INT_L */
+	PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST),
+	/* A21 : ISH_GP3 ==> NC */
+	PAD_CFG_NC(GPP_A21),
+	/* A22 : ISH_GP4 ==> NC */
+	PAD_CFG_NC(GPP_A22),
+	/* A23 : ISH_GP5 ==> NC */
+	PAD_CFG_NC(GPP_A23),
+
+	/* B0  : CORE_VID0 ==> NC(TP42) */
+	PAD_CFG_NC(GPP_B0),
+	/* B1  : CORE_VID1 ==> NC(TP43) */
+	PAD_CFG_NC(GPP_B1),
+	/* B2  : VRALERT# ==> NC */
+	PAD_CFG_NC(GPP_B2),
+	/* B3  : CPU_GP2 ==> NC */
+	PAD_CFG_NC(GPP_B3),
+	/* B4  : CPU_GP3 ==> NC */
+	PAD_CFG_NC(GPP_B4),
+	/* B5  : SRCCLKREQ0# ==> NC */
+	PAD_CFG_NC(GPP_B5),
+	/* B6  : SRCCLKREQ1# ==> WLAN_PCIE_CLKREQ_L */
+	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
+	/* B7  : SRCCLKREQ2# ==> WWAN_PCIE_CLKREQ_L */
+	PAD_CFG_NF(GPP_B7, NONE, DEEP, NF1),
+	/* B8  : SRCCLKREQ3# ==> NC */
+	PAD_CFG_NC(GPP_B8),
+	/* B9  : SRCCLKREQ4# ==> NC */
+	PAD_CFG_NC(GPP_B9),
+	/* B10 : SRCCLKREQ5# ==> NC */
+	PAD_CFG_NC(GPP_B10),
+	/* B11 : EXT_PWR_GATE# ==> NC */
+	PAD_CFG_NC(GPP_B11),
+	/* B12 : SLP_S0# ==> SLP_S0_L_G */
+	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
+	/* B13 : PLTRST# ==> PLT_RST_L */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
+	/* B14 : SPKR ==> NC */
+	PAD_CFG_NC(GPP_B14),
+	/* B15 : GSPI0_CS# ==> PCH_SPI_H1_3V3_CS_L */
+	PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1),
+	/* B16 : GSPI0_CLK ==> PCH_SPI_H1_3V3_CLK */
+	PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1),
+	/* B17 : GSPI0_MISO ==> PCH_SPI_H1_3V3_MISO */
+	PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1),
+	/* B18 : GSPI0_MOSI ==> PCH_SPI_H1_3V3_MOSI */
+	PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1),
+	/* B19 : GSPI1_CS# ==> PCH_SPI_FP_CS_L */
+	PAD_CFG_NF(GPP_B19, NONE, DEEP, NF1),
+	/* B20 : GSPI1_CLK ==> PCH_SPI_FP_CLK */
+	PAD_CFG_NF(GPP_B20, NONE, DEEP, NF1),
+	/* B21 : GSPI1_MISO ==> PCH_SPI_FP_MISO */
+	PAD_CFG_NF(GPP_B21, NONE, DEEP, NF1),
+	/* B22 : GSPI1_MOSI ==> PCH_SPI_FP_MOSI */
+	PAD_CFG_NF(GPP_B22, NONE, DEEP, NF1),
+	/* B23 : SM1ALERT# ==> NC */
+	PAD_CFG_NC(GPP_B23),
+
+	/* C0  : SMBCLK ==> NC */
+	PAD_CFG_NC(GPP_C0),
+	/* C1  : SMBDATA ==> NC */
+	PAD_CFG_NC(GPP_C1),
+	/* C2  : SMBALERT# ==> NC */
+	PAD_CFG_NC(GPP_C2),
+	/* C3  : SML0CLK ==> NC */
+	PAD_CFG_NC(GPP_C3),
+	/* C4  : SML0DATA ==> NC */
+	PAD_CFG_NC(GPP_C4),
+	/* C5  : SML0ALERT# ==> NC */
+	PAD_CFG_NC(GPP_C5),
+	/* C6  : SM1CLK ==> EC_IN_RW_OD */
+	PAD_CFG_GPI(GPP_C6, 20K_PU, DEEP),
+	/* C7  : SM1DATA ==> NC */
+	PAD_CFG_NC(GPP_C7),
+	/* C8  : UART0_RXD ==> FP_INT */
+	PAD_CFG_GPI_APIC(GPP_C8, NONE, PLTRST),
+	/* C9  : UART0_TXD ==> FP_RST_ODL */
+	PAD_CFG_GPO(GPP_C9, 0, DEEP), /* FP_RST_ODL */
+	/* C10 : UART0_RTS# ==> NC */
+	PAD_CFG_NC(GPP_C10),
+	/* C11 : UART0_CTS# ==> NC */
+	PAD_CFG_NC(GPP_C11),
+	/* C12 : UART1_RXD ==> PCH_MEM_CONFIG[0] */
+	PAD_CFG_GPI(GPP_C12, NONE, DEEP),
+	/* C13 : UART1_TXD ==> PCH_MEM_CONFIG[1] */
+	PAD_CFG_GPI(GPP_C13, NONE, DEEP),
+	/* C14 : UART1_RTS# ==> PCH_MEM_CONFIG[2] */
+	PAD_CFG_GPI(GPP_C14, NONE, DEEP),
+	/* C15 : UART1_CTS# ==> PCH_MEM_CONFIG[3] */
+	PAD_CFG_GPI(GPP_C15, NONE, DEEP),
+	/* C16 : I2C0_SDA ==> PCH_I2C0_TOUCHSCREEN_3V3_SDA */
+	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
+	/* C17 : I2C0_SCL ==> PCH_I2C0_TOUCHSCREEN_3V3_SCL */
+	PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1),
+	/* C18 : I2C1_SDA ==> PCH_I2C1_NFC_3V3_SDA */
+	PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1),
+	/* C19 : I2C1_SCL ==> PCH_I2C1_NFC_3V3_SCL */
+	PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1),
+	/* C20 : UART2_RXD ==> PCHRX_SERVOTX_UART */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
+	/* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
+	/* C22 : UART2_RTS# ==> EN_PP3300_DX_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_C22, 1, DEEP),
+	/* C23 : UART2_CTS# ==> PCH_WP */
+	PAD_CFG_GPI(GPP_C23, 20K_PU, DEEP),
+
+	/* D0  : SPI1_CS# ==> NC */
+	PAD_CFG_NC(GPP_D0),
+	/* D1  : SPI1_CLK ==> PEN_IRQ_L */
+	PAD_CFG_GPI_APIC(GPP_D1, NONE, PLTRST),
+	/* D2  : SPI1_MISO ==> PEN_PDCT_L */
+	PAD_CFG_GPI(GPP_D2, NONE, DEEP),
+	/* D3  : SPI1_MOSI ==> NC */
+	PAD_CFG_NC(GPP_D3),
+	/* D4  : FASHTRIG ==> NC */
+	PAD_CFG_NC(GPP_D4),
+	/* D5  : ISH_I2C0_SDA ==> ISH_I2C_SENSOR_1V8_SDA */
+	PAD_CFG_NF_1V8(GPP_D5, NONE, DEEP, NF1),
+	/* D6  : ISH_I2C0_SCL ==> ISH_I2C_SENSOR_1V8_SCL */
+	PAD_CFG_NF_1V8(GPP_D6, NONE, DEEP, NF1),
+	/* D7  : ISH_I2C1_SDA ==> NC */
+	PAD_CFG_NC(GPP_D7),
+	/* D8  : ISH_I2C1_SCL ==> NC */
+	PAD_CFG_NC(GPP_D8),
+	/* D9  : ISH_SPI_CS# ==> HP_IRQ_GPIO */
+	PAD_CFG_GPI(GPP_D9, NONE, PLTRST),
+	/* D10 : ISH_SPI_CLK ==> SPKR_RST_L */
+	PAD_CFG_GPO(GPP_D10, 1, DEEP),
+	/* D11 : ISH_SPI_MISO ==> SPKR_INT_L */
+	PAD_CFG_GPI_APIC(GPP_D11, NONE, PLTRST),
+	/* D12 : ISH_SPI_MOSI ==> NC */
+	PAD_CFG_NC(GPP_D12),
+	/* D13 : ISH_UART0_RXD ==> NC */
+	PAD_CFG_NC(GPP_D13),
+	/* D14 : ISH_UART0_TXD ==> NC */
+	PAD_CFG_NC(GPP_D14),
+	/* D15 : ISH_UART0_RTS# ==> MIC_IRQ_L */
+	PAD_CFG_GPI_APIC(GPP_D15, NONE, PLTRST),
+	/* D16 : ISH_UART0_CTS# ==> NC */
+	PAD_CFG_NC(GPP_D16),
+	/* D17 : DMIC_CLK1 */
+	PAD_CFG_NF(GPP_D17, NONE, DEEP, NF1),
+	/* D18 : DMIC_DATA1 */
+	PAD_CFG_NF(GPP_D18, NONE, DEEP, NF1),
+	/* D19 : DMIC_CLK0 */
+	PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1),
+	/* D20 : DMIC_DATA0 */
+	PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1),
+	/* D21 : SPI1_IO2 ==> NC */
+	PAD_CFG_NC(GPP_D21),
+	/* D22 : SPI1_IO3 ==> BOOT_BEEP_OVERRIDE */
+	PAD_CFG_GPO(GPP_D22, 1, DEEP),
+	/* D23 : I2S_MCLK ==> I2S_MCLK_R */
+	PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1),
+
+	/* E0  : SATAXPCI0 ==> H1_PCH_INT_ODL */
+	PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
+	/* E1  : SATAXPCIE1 ==> NC */
+	PAD_CFG_NC(GPP_E1),
+	/* E2  : SATAXPCIE2 ==> NC */
+	PAD_CFG_NC(GPP_E2),
+	/* E3  : CPU_GP0 ==> NC */
+	PAD_CFG_NC(GPP_E3),
+	/* E4  : SATA_DEVSLP0 ==> NFC_RESET_ODL */
+	PAD_CFG_GPO(GPP_E4, 0, DEEP),
+	/* E5  : SATA_DEVSLP1 ==> NFC_INT_L */
+	PAD_CFG_GPI_APIC(GPP_E5, NONE, PLTRST),
+	/* E6  : SATA_DEVSLP2 ==> NFC_FW_DL */
+	PAD_CFG_GPO(GPP_E6, 0, DEEP), /* NFC_FW_DL */
+	/* E7  : CPU_GP1 ==> TOUCHSCREEN_INT_L */
+	PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST), /* TOUCHSCREEN_INT_L */
+	/* E8  : SATALED# ==> NC */
+	PAD_CFG_NC(GPP_E8),
+	/* E9  : USB2_OCO# ==> USB_C0_OC_ODL */
+	PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1),
+	/* E10 : USB2_OC1# ==> USB_C1_OC_ODL */
+	PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1),
+	/* E11 : USB2_OC2# ==> TOUCHSCREEN_RESET_L */
+	PAD_CFG_GPO(GPP_E11, 0, DEEP),
+	/* E12 : USB2_OC3# ==> USB2_OC3_L */
+	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
+	/* E13 : DDPB_HPD0 ==> USB_C0_DP_HPD */
+	PAD_CFG_NF(GPP_E13, 20K_PD, DEEP, NF1),
+	/* E14 : DDPC_HPD1 ==> USB_C1_DP_HPD */
+	PAD_CFG_NF(GPP_E14, 20K_PD, DEEP, NF1),
+	/* E15 : DDPD_HPD2 ==> SD_CD# */
+	PAD_CFG_GPI(GPP_E15, 20K_PU, DEEP),
+	/* E16 : DDPE_HPD3 ==> NC(TP244) */
+	PAD_CFG_NC(GPP_E16),
+	/* E17 : EDP_HPD */
+	PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1),
+	/* E18 : DDPB_CTRLCLK ==> NC */
+	PAD_CFG_NC(GPP_E18),
+	/* E19 : DDPB_CTRLDATA ==> NC */
+	PAD_CFG_NC(GPP_E19),
+	/* E20 : DDPC_CTRLCLK ==> NC */
+	PAD_CFG_NC(GPP_E20),
+	/* E21 : DDPC_CTRLDATA ==> NC */
+	PAD_CFG_NC(GPP_E21),
+	/* E22 : DDPD_CTRLCLK ==> NC */
+	PAD_CFG_NC(GPP_E22),
+	/* E23 : DDPD_CTRLDATA ==> NC */
+	PAD_CFG_NC(GPP_E23),
+
+	/* The next 4 pads are for bit banging the amplifiers, default to I2S */
+	/* F0  : I2S2_SCLK ==> I2S2_SCLK_SPKR_R */
+	PAD_CFG_GPI(GPP_F0, NONE, DEEP),
+	/* F1  : I2S2_SFRM ==> I2S2_SFRM_SPKR_R */
+	PAD_CFG_GPI(GPP_F1, NONE, DEEP),
+	/* F2  : I2S2_TXD ==> I2S2_PCH_TX_SPKR_RX_R */
+	PAD_CFG_GPI(GPP_F2, NONE, DEEP),
+	/* F3  : I2S2_RXD */
+	PAD_CFG_GPI(GPP_F3, NONE, DEEP),
+	/* F4  : I2C2_SDA ==> PCH_I2C2_CAM_PMIC_1V8_SDA */
+	PAD_CFG_NF_1V8(GPP_F4, NONE, DEEP, NF1),
+	/* F5  : I2C2_SCL ==> PCH_I2C2_CAM_PMIC_1V8_SCL */
+	PAD_CFG_NF_1V8(GPP_F5, NONE, DEEP, NF1),
+	/* F6  : I2C3_SDA ==> PCH_I2C3_PEN_1V8_SDA */
+	PAD_CFG_NF_1V8(GPP_F6, NONE, DEEP, NF1),
+	/* F7  : I2C3_SCL ==> PCH_I2C3_PEN_1V8_SCL */
+	PAD_CFG_NF_1V8(GPP_F7, NONE, DEEP, NF1),
+	/* F8  : I2C4_SDA ==> PCH_I2C4_UFCAM_1V8_SDA */
+	PAD_CFG_NF_1V8(GPP_F8, NONE, DEEP, NF1),
+	/* F9  : I2C4_SCL ==> PCH_I2C4_UFCAM_1V8_SCL */
+	PAD_CFG_NF_1V8(GPP_F9, NONE, DEEP, NF1),
+	/* F10 : I2C5_SDA ==> PCH_I2C5_AUDIO_1V8_SDA */
+	PAD_CFG_NF_1V8(GPP_F10, NONE, DEEP, NF1),
+	/* F11 : I2C5_SCL ==> PCH_I2C5_AUDIO_1V8_SCL */
+	PAD_CFG_NF_1V8(GPP_F11, NONE, DEEP, NF1),
+	/* F12 : EMMC_CMD */
+	PAD_CFG_NF(GPP_F12, NONE, DEEP, NF1),
+	/* F13 : EMMC_DATA0 */
+	PAD_CFG_NF(GPP_F13, NONE, DEEP, NF1),
+	/* F14 : EMMC_DATA1 */
+	PAD_CFG_NF(GPP_F14, NONE, DEEP, NF1),
+	/* F15 : EMMC_DATA2 */
+	PAD_CFG_NF(GPP_F15, NONE, DEEP, NF1),
+	/* F16 : EMMC_DATA3 */
+	PAD_CFG_NF(GPP_F16, NONE, DEEP, NF1),
+	/* F17 : EMMC_DATA4 */
+	PAD_CFG_NF(GPP_F17, NONE, DEEP, NF1),
+	/* F18 : EMMC_DATA5 */
+	PAD_CFG_NF(GPP_F18, NONE, DEEP, NF1),
+	/* F19 : EMMC_DATA6 */
+	PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1),
+	/* F20 : EMMC_DATA7 */
+	PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1),
+	/* F21 : EMMC_RCLK */
+	PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1),
+	/* F22 : EMMC_CLK */
+	PAD_CFG_NF(GPP_F22, NONE, DEEP, NF1),
+	/* F23 : RSVD ==> NC */
+	PAD_CFG_NC(GPP_F23),
+
+	/* G0  : SD_CMD */
+	PAD_CFG_NF(GPP_G0, NONE, DEEP, NF1),
+	/* G1  : SD_DATA0 */
+	PAD_CFG_NF(GPP_G1, NONE, DEEP, NF1),
+	/* G2  : SD_DATA1 */
+	PAD_CFG_NF(GPP_G2, NONE, DEEP, NF1),
+	/* G3  : SD_DATA2 */
+	PAD_CFG_NF(GPP_G3, NONE, DEEP, NF1),
+	/* G4  : SD_DATA3 */
+	PAD_CFG_NF(GPP_G4, NONE, DEEP, NF1),
+	/* G5  : SD_CD# */
+	PAD_CFG_NF(GPP_G5, NONE, DEEP, NF1),
+	/* G6  : SD_CLK */
+	PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
+	/* G7  : SD_WP */
+	PAD_CFG_NF(GPP_G7, 20K_PD, DEEP, NF1),
+
+	/* GPD0: BATLOW# ==> PCH_BATLOW_L */
+	PAD_CFG_NF(GPD0, NONE, DEEP, NF1),
+	/* GPD1: ACPRESENT ==> EC_PCH_ACPRESENT */
+	PAD_CFG_NF(GPD1, NONE, DEEP, NF1),
+	/* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_R_L */
+	PAD_CFG_NF(GPD2, NONE, DEEP, NF1),
+	/* GPD3: PWRBTN# ==> PCH_PWR_BTN_L */
+	PAD_CFG_NF(GPD3, 20K_PU, DEEP, NF1),
+	/* GPD4: SLP_S3# ==> SLP_S3_L */
+	PAD_CFG_NF(GPD4, NONE, DEEP, NF1),
+	/* GPD5: SLP_S4# ==> SLP_S4_L */
+	PAD_CFG_NF(GPD5, NONE, DEEP, NF1),
+	/* GPD6: SLP_A# ==> NC(TP26) */
+	PAD_CFG_NC(GPD6),
+	/* GPD7: RSVD ==> NC */
+	PAD_CFG_NC(GPD7),
+	/* GPD8: SUSCLK ==> PCH_SUSCLK */
+	PAD_CFG_NF(GPD8, NONE, DEEP, NF1),
+	/* GPD9: SLP_WLAN# ==> NC(TP25) */
+	PAD_CFG_NC(GPD9),
+	/* GPD10: SLP_S5# ==> NC(TP15) */
+	PAD_CFG_NC(GPD10), /* TP15 */
+	/* GPD11: LANPHYC ==> NC */
+	PAD_CFG_NC(GPD11),
+};
+
+/* Early pad configuration in bootblock */
+static const struct pad_config early_gpio_table[] = {
+	/* B15 : GSPI0_CS# ==> PCH_SPI_H1_3V3_CS_L */
+	PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1),
+	/* B16 : GSPI0_CLK ==> PCH_SPI_H1_3V3_CLK */
+	PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1),
+	/* B17 : GSPI0_MISO ==> PCH_SPI_H1_3V3_MISO */
+	PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1),
+	/* B18 : GSPI0_MOSI ==> PCH_SPI_H1_3V3_MOSI */
+	PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1),
+
+	/* Ensure UART pins are in native mode for H1. */
+	/* C20 : UART2_RXD ==> PCHRX_SERVOTX_UART */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
+	/* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
+
+	/* C23 : UART2_CTS# ==> PCH_WP */
+	PAD_CFG_GPI(GPP_C23, 20K_PU, DEEP),
+
+	/* E0  : SATAXPCI0 ==> H1_PCH_INT_ODL */
+	PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
+};
+
+const struct pad_config * __attribute__((weak)) 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)
+{
+	*num = ARRAY_SIZE(early_gpio_table);
+	return early_gpio_table;
+}
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/gpio.h
index 57d5e18b67..628483bf52 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/gpio.h
@@ -37,365 +37,4 @@
 /* eSPI virtual wire reporting */
 #define EC_SCI_GPI		GPE0_ESPI
 
-#ifndef __ACPI__
-/* Pad configuration in ramstage */
-/* Leave eSPI pins untouched from default settings */
-static const struct pad_config gpio_table[] = {
-	/* A0  : RCIN# ==> NC(TP41) */
-	PAD_CFG_NC(GPP_A0),
-	/* A1  : ESPI_IO0 */
-	/* A2  : ESPI_IO1 */
-	/* A3  : ESPI_IO2 */
-	/* A4  : ESPI_IO3 */
-	/* A5  : ESPI_CS# */
-	/* A6  : SERIRQ ==> NC(TP44) */
-	PAD_CFG_NC(GPP_A6),
-	/* A7  : PIRQA# ==> NC */
-	PAD_CFG_NC(GPP_A7),
-	/* A8  : CLKRUN# ==> NC(TP45) */
-	PAD_CFG_NC(GPP_A8),
-	/* A9  : ESPI_CLK */
-	/* A10 : CLKOUT_LPC1 ==> NC */
-	PAD_CFG_NC(GPP_A10),
-	/* A11 : PME# ==> NC(TP67) */
-	PAD_CFG_NC(GPP_A11),
-	/* A12 : BM_BUSY# ==> NC */
-	PAD_CFG_NC(GPP_A12),
-	/* A13 : SUSWARN# ==> NC */
-	PAD_CFG_NC(GPP_A13),
-	/* A14 : ESPI_RESET# */
-	/* A15 : SUSACK# ==> SUSACK_L */
-	PAD_CFG_NF(GPP_A15, NONE, DEEP, NF1),
-	/* A16 : SD_1P8_SEL ==> SD_PWR_1800_SEL */
-	PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1),
-	/* A17 : SD_PWR_EN# ==> EN_SD_SOCKET_PWR_L */
-	PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1),
-	/* A18 : ISH_GP0 ==> NC */
-	PAD_CFG_NC(GPP_A18),
-	/* A19 : ISH_GP1 ==> NC */
-	PAD_CFG_NC(GPP_A19),
-	/* A20 : ISH_GP2 ==> ACCEL_GYRO_INT_L */
-	PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST),
-	/* A21 : ISH_GP3 ==> NC */
-	PAD_CFG_NC(GPP_A21),
-	/* A22 : ISH_GP4 ==> NC */
-	PAD_CFG_NC(GPP_A22),
-	/* A23 : ISH_GP5 ==> NC */
-	PAD_CFG_NC(GPP_A23),
-
-	/* B0  : CORE_VID0 ==> NC(TP42) */
-	PAD_CFG_NC(GPP_B0),
-	/* B1  : CORE_VID1 ==> NC(TP43) */
-	PAD_CFG_NC(GPP_B1),
-	/* B2  : VRALERT# ==> NC */
-	PAD_CFG_NC(GPP_B2),
-	/* B3  : CPU_GP2 ==> NC */
-	PAD_CFG_NC(GPP_B3),
-	/* B4  : CPU_GP3 ==> NC */
-	PAD_CFG_NC(GPP_B4),
-	/* B5  : SRCCLKREQ0# ==> NC */
-	PAD_CFG_NC(GPP_B5),
-	/* B6  : SRCCLKREQ1# ==> WLAN_PCIE_CLKREQ_L */
-	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
-	/* B7  : SRCCLKREQ2# ==> WWAN_PCIE_CLKREQ_L */
-	PAD_CFG_NF(GPP_B7, NONE, DEEP, NF1),
-	/* B8  : SRCCLKREQ3# ==> NC */
-	PAD_CFG_NC(GPP_B8),
-	/* B9  : SRCCLKREQ4# ==> NC */
-	PAD_CFG_NC(GPP_B9),
-	/* B10 : SRCCLKREQ5# ==> NC */
-	PAD_CFG_NC(GPP_B10),
-	/* B11 : EXT_PWR_GATE# ==> NC */
-	PAD_CFG_NC(GPP_B11),
-	/* B12 : SLP_S0# ==> SLP_S0_L_G */
-	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
-	/* B13 : PLTRST# ==> PLT_RST_L */
-	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
-	/* B14 : SPKR ==> NC */
-	PAD_CFG_NC(GPP_B14),
-	/* B15 : GSPI0_CS# ==> PCH_SPI_H1_3V3_CS_L */
-	PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1),
-	/* B16 : GSPI0_CLK ==> PCH_SPI_H1_3V3_CLK */
-	PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1),
-	/* B17 : GSPI0_MISO ==> PCH_SPI_H1_3V3_MISO */
-	PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1),
-	/* B18 : GSPI0_MOSI ==> PCH_SPI_H1_3V3_MOSI */
-	PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1),
-	/* B19 : GSPI1_CS# ==> PCH_SPI_FP_CS_L */
-	PAD_CFG_NF(GPP_B19, NONE, DEEP, NF1),
-	/* B20 : GSPI1_CLK ==> PCH_SPI_FP_CLK */
-	PAD_CFG_NF(GPP_B20, NONE, DEEP, NF1),
-	/* B21 : GSPI1_MISO ==> PCH_SPI_FP_MISO */
-	PAD_CFG_NF(GPP_B21, NONE, DEEP, NF1),
-	/* B22 : GSPI1_MOSI ==> PCH_SPI_FP_MOSI */
-	PAD_CFG_NF(GPP_B22, NONE, DEEP, NF1),
-	/* B23 : SM1ALERT# ==> NC */
-	PAD_CFG_NC(GPP_B23),
-
-	/* C0  : SMBCLK ==> NC */
-	PAD_CFG_NC(GPP_C0),
-	/* C1  : SMBDATA ==> NC */
-	PAD_CFG_NC(GPP_C1),
-	/* C2  : SMBALERT# ==> NC */
-	PAD_CFG_NC(GPP_C2),
-	/* C3  : SML0CLK ==> NC */
-	PAD_CFG_NC(GPP_C3),
-	/* C4  : SML0DATA ==> NC */
-	PAD_CFG_NC(GPP_C4),
-	/* C5  : SML0ALERT# ==> NC */
-	PAD_CFG_NC(GPP_C5),
-	/* C6  : SM1CLK ==> EC_IN_RW_OD */
-	PAD_CFG_GPI(GPP_C6, 20K_PU, DEEP),
-	/* C7  : SM1DATA ==> NC */
-	PAD_CFG_NC(GPP_C7),
-	/* C8  : UART0_RXD ==> FP_INT */
-	PAD_CFG_GPI_APIC(GPP_C8, NONE, PLTRST),
-	/* C9  : UART0_TXD ==> FP_RST_ODL */
-	PAD_CFG_GPO(GPP_C9, 0, DEEP), /* FP_RST_ODL */
-	/* C10 : UART0_RTS# ==> NC */
-	PAD_CFG_NC(GPP_C10),
-	/* C11 : UART0_CTS# ==> NC */
-	PAD_CFG_NC(GPP_C11),
-	/* C12 : UART1_RXD ==> PCH_MEM_CONFIG[0] */
-	PAD_CFG_GPI(GPP_C12, NONE, DEEP),
-	/* C13 : UART1_TXD ==> PCH_MEM_CONFIG[1] */
-	PAD_CFG_GPI(GPP_C13, NONE, DEEP),
-	/* C14 : UART1_RTS# ==> PCH_MEM_CONFIG[2] */
-	PAD_CFG_GPI(GPP_C14, NONE, DEEP),
-	/* C15 : UART1_CTS# ==> PCH_MEM_CONFIG[3] */
-	PAD_CFG_GPI(GPP_C15, NONE, DEEP),
-	/* C16 : I2C0_SDA ==> PCH_I2C0_TOUCHSCREEN_3V3_SDA */
-	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
-	/* C17 : I2C0_SCL ==> PCH_I2C0_TOUCHSCREEN_3V3_SCL */
-	PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1),
-	/* C18 : I2C1_SDA ==> PCH_I2C1_NFC_3V3_SDA */
-	PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1),
-	/* C19 : I2C1_SCL ==> PCH_I2C1_NFC_3V3_SCL */
-	PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1),
-	/* C20 : UART2_RXD ==> PCHRX_SERVOTX_UART */
-	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
-	/* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */
-	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
-	/* C22 : UART2_RTS# ==> EN_PP3300_DX_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_C22, 1, DEEP),
-	/* C23 : UART2_CTS# ==> PCH_WP */
-	PAD_CFG_GPI(GPP_C23, 20K_PU, DEEP),
-
-	/* D0  : SPI1_CS# ==> NC */
-	PAD_CFG_NC(GPP_D0),
-	/* D1  : SPI1_CLK ==> PEN_IRQ_L */
-	PAD_CFG_GPI_APIC(GPP_D1, NONE, PLTRST),
-	/* D2  : SPI1_MISO ==> PEN_PDCT_L */
-	PAD_CFG_GPI(GPP_D2, NONE, DEEP),
-	/* D3  : SPI1_MOSI ==> NC */
-	PAD_CFG_NC(GPP_D3),
-	/* D4  : FASHTRIG ==> NC */
-	PAD_CFG_NC(GPP_D4),
-	/* D5  : ISH_I2C0_SDA ==> ISH_I2C_SENSOR_1V8_SDA */
-	PAD_CFG_NF_1V8(GPP_D5, NONE, DEEP, NF1),
-	/* D6  : ISH_I2C0_SCL ==> ISH_I2C_SENSOR_1V8_SCL */
-	PAD_CFG_NF_1V8(GPP_D6, NONE, DEEP, NF1),
-	/* D7  : ISH_I2C1_SDA ==> NC */
-	PAD_CFG_NC(GPP_D7),
-	/* D8  : ISH_I2C1_SCL ==> NC */
-	PAD_CFG_NC(GPP_D8),
-	/* D9  : ISH_SPI_CS# ==> HP_IRQ_GPIO */
-	PAD_CFG_GPI(GPP_D9, NONE, PLTRST),
-	/* D10 : ISH_SPI_CLK ==> SPKR_RST_L */
-	PAD_CFG_GPO(GPP_D10, 1, DEEP),
-	/* D11 : ISH_SPI_MISO ==> SPKR_INT_L */
-	PAD_CFG_GPI_APIC(GPP_D11, NONE, PLTRST),
-	/* D12 : ISH_SPI_MOSI ==> NC */
-	PAD_CFG_NC(GPP_D12),
-	/* D13 : ISH_UART0_RXD ==> NC */
-	PAD_CFG_NC(GPP_D13),
-	/* D14 : ISH_UART0_TXD ==> NC */
-	PAD_CFG_NC(GPP_D14),
-	/* D15 : ISH_UART0_RTS# ==> MIC_IRQ_L */
-	PAD_CFG_GPI_APIC(GPP_D15, NONE, PLTRST),
-	/* D16 : ISH_UART0_CTS# ==> NC */
-	PAD_CFG_NC(GPP_D16),
-	/* D17 : DMIC_CLK1 */
-	PAD_CFG_NF(GPP_D17, NONE, DEEP, NF1),
-	/* D18 : DMIC_DATA1 */
-	PAD_CFG_NF(GPP_D18, NONE, DEEP, NF1),
-	/* D19 : DMIC_CLK0 */
-	PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1),
-	/* D20 : DMIC_DATA0 */
-	PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1),
-	/* D21 : SPI1_IO2 ==> NC */
-	PAD_CFG_NC(GPP_D21),
-	/* D22 : SPI1_IO3 ==> BOOT_BEEP_OVERRIDE */
-	PAD_CFG_GPO(GPP_D22, 1, DEEP),
-	/* D23 : I2S_MCLK ==> I2S_MCLK_R */
-	PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1),
-
-	/* E0  : SATAXPCI0 ==> H1_PCH_INT_ODL */
-	PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
-	/* E1  : SATAXPCIE1 ==> NC */
-	PAD_CFG_NC(GPP_E1),
-	/* E2  : SATAXPCIE2 ==> NC */
-	PAD_CFG_NC(GPP_E2),
-	/* E3  : CPU_GP0 ==> NC */
-	PAD_CFG_NC(GPP_E3),
-	/* E4  : SATA_DEVSLP0 ==> NFC_RESET_ODL */
-	PAD_CFG_GPO(GPP_E4, 0, DEEP),
-	/* E5  : SATA_DEVSLP1 ==> NFC_INT_L */
-	PAD_CFG_GPI_APIC(GPP_E5, NONE, PLTRST),
-	/* E6  : SATA_DEVSLP2 ==> NFC_FW_DL */
-	PAD_CFG_GPO(GPP_E6, 0, DEEP), /* NFC_FW_DL */
-	/* E7  : CPU_GP1 ==> TOUCHSCREEN_INT_L */
-	PAD_CFG_GPI_APIC(GPP_E7, NONE, PLTRST), /* TOUCHSCREEN_INT_L */
-	/* E8  : SATALED# ==> NC */
-	PAD_CFG_NC(GPP_E8),
-	/* E9  : USB2_OCO# ==> USB_C0_OC_ODL */
-	PAD_CFG_NF(GPP_E9, NONE, DEEP, NF1),
-	/* E10 : USB2_OC1# ==> USB_C1_OC_ODL */
-	PAD_CFG_NF(GPP_E10, NONE, DEEP, NF1),
-	/* E11 : USB2_OC2# ==> TOUCHSCREEN_RESET_L */
-	PAD_CFG_GPO(GPP_E11, 0, DEEP),
-	/* E12 : USB2_OC3# ==> USB2_OC3_L */
-	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
-	/* E13 : DDPB_HPD0 ==> USB_C0_DP_HPD */
-	PAD_CFG_NF(GPP_E13, 20K_PD, DEEP, NF1),
-	/* E14 : DDPC_HPD1 ==> USB_C1_DP_HPD */
-	PAD_CFG_NF(GPP_E14, 20K_PD, DEEP, NF1),
-	/* E15 : DDPD_HPD2 ==> SD_CD# */
-	PAD_CFG_GPI(GPP_E15, 20K_PU, DEEP),
-	/* E16 : DDPE_HPD3 ==> NC(TP244) */
-	PAD_CFG_NC(GPP_E16),
-	/* E17 : EDP_HPD */
-	PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1),
-	/* E18 : DDPB_CTRLCLK ==> NC */
-	PAD_CFG_NC(GPP_E18),
-	/* E19 : DDPB_CTRLDATA ==> NC */
-	PAD_CFG_NC(GPP_E19),
-	/* E20 : DDPC_CTRLCLK ==> NC */
-	PAD_CFG_NC(GPP_E20),
-	/* E21 : DDPC_CTRLDATA ==> NC */
-	PAD_CFG_NC(GPP_E21),
-	/* E22 : DDPD_CTRLCLK ==> NC */
-	PAD_CFG_NC(GPP_E22),
-	/* E23 : DDPD_CTRLDATA ==> NC */
-	PAD_CFG_NC(GPP_E23),
-
-	/* The next 4 pads are for bit banging the amplifiers, default to I2S */
-	/* F0  : I2S2_SCLK ==> I2S2_SCLK_SPKR_R */
-	PAD_CFG_GPI(GPP_F0, NONE, DEEP),
-	/* F1  : I2S2_SFRM ==> I2S2_SFRM_SPKR_R */
-	PAD_CFG_GPI(GPP_F1, NONE, DEEP),
-	/* F2  : I2S2_TXD ==> I2S2_PCH_TX_SPKR_RX_R */
-	PAD_CFG_GPI(GPP_F2, NONE, DEEP),
-	/* F3  : I2S2_RXD */
-	PAD_CFG_GPI(GPP_F3, NONE, DEEP),
-	/* F4  : I2C2_SDA ==> PCH_I2C2_CAM_PMIC_1V8_SDA */
-	PAD_CFG_NF_1V8(GPP_F4, NONE, DEEP, NF1),
-	/* F5  : I2C2_SCL ==> PCH_I2C2_CAM_PMIC_1V8_SCL */
-	PAD_CFG_NF_1V8(GPP_F5, NONE, DEEP, NF1),
-	/* F6  : I2C3_SDA ==> PCH_I2C3_PEN_1V8_SDA */
-	PAD_CFG_NF_1V8(GPP_F6, NONE, DEEP, NF1),
-	/* F7  : I2C3_SCL ==> PCH_I2C3_PEN_1V8_SCL */
-	PAD_CFG_NF_1V8(GPP_F7, NONE, DEEP, NF1),
-	/* F8  : I2C4_SDA ==> PCH_I2C4_UFCAM_1V8_SDA */
-	PAD_CFG_NF_1V8(GPP_F8, NONE, DEEP, NF1),
-	/* F9  : I2C4_SCL ==> PCH_I2C4_UFCAM_1V8_SCL */
-	PAD_CFG_NF_1V8(GPP_F9, NONE, DEEP, NF1),
-	/* F10 : I2C5_SDA ==> PCH_I2C5_AUDIO_1V8_SDA */
-	PAD_CFG_NF_1V8(GPP_F10, NONE, DEEP, NF1),
-	/* F11 : I2C5_SCL ==> PCH_I2C5_AUDIO_1V8_SCL */
-	PAD_CFG_NF_1V8(GPP_F11, NONE, DEEP, NF1),
-	/* F12 : EMMC_CMD */
-	PAD_CFG_NF(GPP_F12, NONE, DEEP, NF1),
-	/* F13 : EMMC_DATA0 */
-	PAD_CFG_NF(GPP_F13, NONE, DEEP, NF1),
-	/* F14 : EMMC_DATA1 */
-	PAD_CFG_NF(GPP_F14, NONE, DEEP, NF1),
-	/* F15 : EMMC_DATA2 */
-	PAD_CFG_NF(GPP_F15, NONE, DEEP, NF1),
-	/* F16 : EMMC_DATA3 */
-	PAD_CFG_NF(GPP_F16, NONE, DEEP, NF1),
-	/* F17 : EMMC_DATA4 */
-	PAD_CFG_NF(GPP_F17, NONE, DEEP, NF1),
-	/* F18 : EMMC_DATA5 */
-	PAD_CFG_NF(GPP_F18, NONE, DEEP, NF1),
-	/* F19 : EMMC_DATA6 */
-	PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1),
-	/* F20 : EMMC_DATA7 */
-	PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1),
-	/* F21 : EMMC_RCLK */
-	PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1),
-	/* F22 : EMMC_CLK */
-	PAD_CFG_NF(GPP_F22, NONE, DEEP, NF1),
-	/* F23 : RSVD ==> NC */
-	PAD_CFG_NC(GPP_F23),
-
-	/* G0  : SD_CMD */
-	PAD_CFG_NF(GPP_G0, NONE, DEEP, NF1),
-	/* G1  : SD_DATA0 */
-	PAD_CFG_NF(GPP_G1, NONE, DEEP, NF1),
-	/* G2  : SD_DATA1 */
-	PAD_CFG_NF(GPP_G2, NONE, DEEP, NF1),
-	/* G3  : SD_DATA2 */
-	PAD_CFG_NF(GPP_G3, NONE, DEEP, NF1),
-	/* G4  : SD_DATA3 */
-	PAD_CFG_NF(GPP_G4, NONE, DEEP, NF1),
-	/* G5  : SD_CD# */
-	PAD_CFG_NF(GPP_G5, NONE, DEEP, NF1),
-	/* G6  : SD_CLK */
-	PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
-	/* G7  : SD_WP */
-	PAD_CFG_NF(GPP_G7, 20K_PD, DEEP, NF1),
-
-	/* GPD0: BATLOW# ==> PCH_BATLOW_L */
-	PAD_CFG_NF(GPD0, NONE, DEEP, NF1),
-	/* GPD1: ACPRESENT ==> EC_PCH_ACPRESENT */
-	PAD_CFG_NF(GPD1, NONE, DEEP, NF1),
-	/* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_R_L */
-	PAD_CFG_NF(GPD2, NONE, DEEP, NF1),
-	/* GPD3: PWRBTN# ==> PCH_PWR_BTN_L */
-	PAD_CFG_NF(GPD3, 20K_PU, DEEP, NF1),
-	/* GPD4: SLP_S3# ==> SLP_S3_L */
-	PAD_CFG_NF(GPD4, NONE, DEEP, NF1),
-	/* GPD5: SLP_S4# ==> SLP_S4_L */
-	PAD_CFG_NF(GPD5, NONE, DEEP, NF1),
-	/* GPD6: SLP_A# ==> NC(TP26) */
-	PAD_CFG_NC(GPD6),
-	/* GPD7: RSVD ==> NC */
-	PAD_CFG_NC(GPD7),
-	/* GPD8: SUSCLK ==> PCH_SUSCLK */
-	PAD_CFG_NF(GPD8, NONE, DEEP, NF1),
-	/* GPD9: SLP_WLAN# ==> NC(TP25) */
-	PAD_CFG_NC(GPD9),
-	/* GPD10: SLP_S5# ==> NC(TP15) */
-	PAD_CFG_NC(GPD10), /* TP15 */
-	/* GPD11: LANPHYC ==> NC */
-	PAD_CFG_NC(GPD11),
-};
-
-/* Early pad configuration in bootblock */
-static const struct pad_config early_gpio_table[] = {
-	/* B15 : GSPI0_CS# ==> PCH_SPI_H1_3V3_CS_L */
-	PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1),
-	/* B16 : GSPI0_CLK ==> PCH_SPI_H1_3V3_CLK */
-	PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1),
-	/* B17 : GSPI0_MISO ==> PCH_SPI_H1_3V3_MISO */
-	PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1),
-	/* B18 : GSPI0_MOSI ==> PCH_SPI_H1_3V3_MOSI */
-	PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1),
-
-	/* Ensure UART pins are in native mode for H1. */
-	/* C20 : UART2_RXD ==> PCHRX_SERVOTX_UART */
-	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
-	/* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */
-	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
-
-	/* C23 : UART2_CTS# ==> PCH_WP */
-	PAD_CFG_GPI(GPP_C23, 20K_PU, DEEP),
-
-	/* E0  : SATAXPCI0 ==> H1_PCH_INT_ODL */
-	PAD_CFG_GPI_APIC_INVERT(GPP_E0, NONE, PLTRST),
-};
-
-#endif /* __ACPI__ */
-
 #endif /* BASEBOARD_GPIO_H */
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
new file mode 100644
index 0000000000..c9bb401a6e
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+#ifndef __BASEBOARD_VARIANTS_H__
+#define __BASEBOARD_VARIANTS_H__
+
+#include <soc/gpio.h>
+#include <stdint.h>
+
+/* Return the board id for the current variant board. */
+uint8_t variant_board_id(void);
+
+/*
+ * The next set of functions return the gpio table and fill in the number of
+ * entries for each table.
+ */
+const struct pad_config *variant_gpio_table(size_t *num);
+const struct pad_config *variant_early_gpio_table(size_t *num);
+
+
+#endif /* __BASEBOARD_VARIANTS_H__ */