92 files changed, 1604 insertions, 177 deletions

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 2d8ee15766..3522787c3c 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -1,4 +1,4 @@
-config BOARD_GOOGLE_HATCH_COMMON
+config BOARD_GOOGLE_BASEBOARD_HATCH
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768
 	select DRIVERS_GENERIC_GPIO_KEYS
@@ -17,6 +17,7 @@ config BOARD_GOOGLE_HATCH_COMMON
 	select GOOGLE_SMBIOS_MAINBOARD_VERSION
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select HAVE_SPD_IN_CBFS
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_TPM2
@@ -24,57 +25,17 @@ config BOARD_GOOGLE_HATCH_COMMON
 	select SOC_INTEL_COMETLAKE_1
 	select SOC_INTEL_COMMON_BLOCK_DTT
 	select SPI_TPM
-	select TPM_GOOGLE_CR50
-
-config BOARD_GOOGLE_BASEBOARD_HATCH
-	def_bool n
-	select BOARD_GOOGLE_HATCH_COMMON
 	select SYSTEM_TYPE_LAPTOP
-
-config BOARD_GOOGLE_BASEBOARD_PUFF
-	def_bool n
-	select BOARD_GOOGLE_HATCH_COMMON
-	select DRIVERS_INTEL_DPTF
-	select ROMSTAGE_SPD_SMBUS
-	select RT8168_GEN_ACPI_POWER_RESOURCE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE
-	select SOC_INTEL_CSE_LITE_SKU
-	select SPD_READ_BY_WORD
-	select FW_CONFIG
-	select FW_CONFIG_SOURCE_CHROMEEC_CBI
+	select TPM_GOOGLE_CR50
 
 config BOARD_GOOGLE_AKEMI
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_AMBASSADOR
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-
-config BOARD_GOOGLE_DOOLY
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
-
 config BOARD_GOOGLE_DRATINI
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_DUFFY_LEGACY
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
-
-config BOARD_GOOGLE_DUFFY
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
-
-config BOARD_GOOGLE_FAFFY
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
-
-config BOARD_GOOGLE_GENESIS
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-
 config BOARD_GOOGLE_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_32768
@@ -97,15 +58,6 @@ config BOARD_GOOGLE_JINLON
 	select DRIVERS_GFX_GENERIC
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_KAISA_LEGACY
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
-
-config BOARD_GOOGLE_KAISA
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
-
 config BOARD_GOOGLE_KINDRED
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select INTEL_GMA_HAVE_VBT
@@ -115,9 +67,6 @@ config BOARD_GOOGLE_KOHAKU
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_MOONBUGGY
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-
 config BOARD_GOOGLE_MUSHU
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select INTEL_GMA_HAVE_VBT
@@ -128,42 +77,25 @@ config BOARD_GOOGLE_NIGHTFURY
 	select DRIVERS_I2C_MAX98390
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_NOIBAT
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
-
 config BOARD_GOOGLE_PALKIA
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select CHROMEOS_DSM_CALIB if CHROMEOS
 	select DRIVERS_I2C_RT1011
 
-config BOARD_GOOGLE_PUFF
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
-
-config BOARD_GOOGLE_SCOUT
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-
-config BOARD_GOOGLE_WYVERN
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
-
-if BOARD_GOOGLE_HATCH_COMMON
+if BOARD_GOOGLE_BASEBOARD_HATCH
 
 config DISABLE_HECI1_AT_PRE_BOOT
-	default y if BOARD_GOOGLE_BASEBOARD_HATCH
+	default y
 
 config CHROMEOS
-	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if !ROMSTAGE_SPD_SMBUS
+	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI
 	select EC_GOOGLE_CHROMEEC_SWITCHES
-	select GBB_FLAG_FORCE_DEV_SWITCH_ON
-	select GBB_FLAG_FORCE_DEV_BOOT_USB
 	select GBB_FLAG_FORCE_DEV_BOOT_ALTFW
+	select GBB_FLAG_FORCE_DEV_BOOT_USB
+	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_MANUAL_RECOVERY
 	select HAS_RECOVERY_MRC_CACHE
 	select VBOOT_LID_SWITCH
-	select CHROMEOS_CSE_BOARD_RESET_OVERRIDE if SOC_INTEL_CSE_LITE_SKU
 
 config CHROMEOS_WIFI_SAR
 	bool "Enable SAR options for ChromeOS build"
@@ -179,37 +111,15 @@ config DEVICETREE
 config DIMM_MAX
 	default 2
 
-config ROMSTAGE_SPD_CBFS
-	bool
-	default y if !ROMSTAGE_SPD_SMBUS
-	select HAVE_SPD_IN_CBFS
-
-config ROMSTAGE_SPD_SMBUS
-	bool
-	default n
-	select SPD_CACHE_IN_FMAP
-
 config DRIVER_TPM_SPI_BUS
 	default 0x1
 
 config UART_FOR_CONSOLE
 	default 0
 
-if BOARD_GOOGLE_BASEBOARD_HATCH
 config FMDFILE
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS
-endif
-
-if BOARD_GOOGLE_BASEBOARD_PUFF
-config FMDFILE
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-puff-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS
-	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-puff-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS
-
-config POWER_OFF_ON_CR50_UPDATE
-	bool
-	default n
-endif
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS
 
 config MAINBOARD_DIR
 	default "google/hatch"
@@ -221,28 +131,15 @@ config MAINBOARD_FAMILY
 config MAINBOARD_PART_NUMBER
 	default "Akemi" if BOARD_GOOGLE_AKEMI
 	default "Dratini" if BOARD_GOOGLE_DRATINI
-	default "Duffy" if BOARD_GOOGLE_DUFFY
-	default "Duffy" if BOARD_GOOGLE_DUFFY_LEGACY
-	default "Faffy" if BOARD_GOOGLE_FAFFY
 	default "Hatch" if BOARD_GOOGLE_HATCH
 	default "Helios" if BOARD_GOOGLE_HELIOS
 	default "Helios_Diskswap" if BOARD_GOOGLE_HELIOS_DISKSWAP
 	default "Jinlon" if BOARD_GOOGLE_JINLON
-	default "Kaisa" if BOARD_GOOGLE_KAISA
-	default "Kaisa" if BOARD_GOOGLE_KAISA_LEGACY
 	default "Kindred" if BOARD_GOOGLE_KINDRED
 	default "Kohaku" if BOARD_GOOGLE_KOHAKU
 	default "Mushu" if BOARD_GOOGLE_MUSHU
-	default "Noibat" if BOARD_GOOGLE_NOIBAT
-	default "Palkia" if BOARD_GOOGLE_PALKIA
 	default "Nightfury" if BOARD_GOOGLE_NIGHTFURY
-	default "Puff" if BOARD_GOOGLE_PUFF
-	default "Wyvern" if BOARD_GOOGLE_WYVERN
-	default "Dooly" if BOARD_GOOGLE_DOOLY
-	default "Ambassador" if BOARD_GOOGLE_AMBASSADOR
-	default "Genesis" if BOARD_GOOGLE_GENESIS
-	default "Scout" if BOARD_GOOGLE_SCOUT
-	default "Moonbuggy" if BOARD_GOOGLE_MOONBUGGY
+	default "Palkia" if BOARD_GOOGLE_PALKIA
 
 config OVERRIDE_DEVICETREE
 	default "variants/helios_diskswap/overridetree.cb" if BOARD_GOOGLE_HELIOS_DISKSWAP
@@ -255,28 +152,15 @@ config TPM_TIS_ACPI_INTERRUPT
 config VARIANT_DIR
 	default "akemi" if BOARD_GOOGLE_AKEMI
 	default "dratini" if BOARD_GOOGLE_DRATINI
-	default "duffy" if BOARD_GOOGLE_DUFFY
-	default "duffy" if BOARD_GOOGLE_DUFFY_LEGACY
-	default "faffy" if BOARD_GOOGLE_FAFFY
 	default "hatch" if BOARD_GOOGLE_HATCH
 	default "helios" if BOARD_GOOGLE_HELIOS
 	default "helios" if BOARD_GOOGLE_HELIOS_DISKSWAP
 	default "jinlon" if BOARD_GOOGLE_JINLON
-	default "kaisa" if BOARD_GOOGLE_KAISA
-	default "kaisa" if BOARD_GOOGLE_KAISA_LEGACY
 	default "kindred" if BOARD_GOOGLE_KINDRED
 	default "kohaku" if BOARD_GOOGLE_KOHAKU
 	default "mushu" if BOARD_GOOGLE_MUSHU
-	default "noibat" if BOARD_GOOGLE_NOIBAT
-	default "palkia" if BOARD_GOOGLE_PALKIA
 	default "nightfury" if BOARD_GOOGLE_NIGHTFURY
-	default "puff" if BOARD_GOOGLE_PUFF
-	default "wyvern" if BOARD_GOOGLE_WYVERN
-	default "dooly" if BOARD_GOOGLE_DOOLY
-	default "ambassador" if BOARD_GOOGLE_AMBASSADOR
-	default "genesis" if BOARD_GOOGLE_GENESIS
-	default "scout" if BOARD_GOOGLE_SCOUT
-	default "moonbuggy" if BOARD_GOOGLE_MOONBUGGY
+	default "palkia" if BOARD_GOOGLE_PALKIA
 
 config VBOOT
 	select HAS_RECOVERY_MRC_CACHE
@@ -285,8 +169,4 @@ config VBOOT
 config USE_PM_ACPI_TIMER
 	default n
 
-config EDK2_BOOT_TIMEOUT
-	int
-	default 5 if BOARD_GOOGLE_BASEBOARD_PUFF
-
-endif # BOARD_GOOGLE_HATCH_COMMON
+endif # BOARD_GOOGLE_BASEBOARD_HATCH
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 1307314e9a..0564476468 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -3,27 +3,9 @@ comment "Hatch"
 config BOARD_GOOGLE_AKEMI
 	bool "->  Akemi (IdeaPad Flex 5/5i Chromebook)"
 
-config BOARD_GOOGLE_AMBASSADOR
-	bool "->  Ambassador"
-
-config BOARD_GOOGLE_DOOLY
-	bool "->  Dooly"
-
 config BOARD_GOOGLE_DRATINI
 	bool "->  Dratini (HP Pro c640 Chromebook)"
 
-config BOARD_GOOGLE_DUFFY_LEGACY
-	bool "->  Duffy Legacy (32MB)"
-
-config BOARD_GOOGLE_DUFFY
-	bool "->  Duffy (ASUS Chromebox 4)"
-
-config BOARD_GOOGLE_FAFFY
-	bool "->  Faffy (ASUS Fanless Chromebox)"
-
-config BOARD_GOOGLE_GENESIS
-	bool "->  Genesis"
-
 config BOARD_GOOGLE_HATCH
 	bool "->  Hatch"
 
@@ -36,38 +18,17 @@ config BOARD_GOOGLE_HELIOS_DISKSWAP
 config BOARD_GOOGLE_JINLON
 	bool "->  Jinlon (HP Elite c1030 Chromebook)"
 
-config BOARD_GOOGLE_KAISA_LEGACY
-	bool "->  Kaisa Legacy (32MB)"
-
-config BOARD_GOOGLE_KAISA
-	bool "->  Kaisa (Acer Chromebox CXI4)"
-
 config BOARD_GOOGLE_KINDRED
 	bool "->  Kindred (Acer Chromebook 712)"
 
 config BOARD_GOOGLE_KOHAKU
 	bool "->  Kohaku (Samsung Galaxy Chromebook)"
 
-config BOARD_GOOGLE_MOONBUGGY
-	bool "->  Moonbuggy"
-
 config BOARD_GOOGLE_MUSHU
 	bool "->  Mushu"
 
 config BOARD_GOOGLE_NIGHTFURY
 	bool "->  Nightfury (Samsung Galaxy Chromebook 2)"
 
-config BOARD_GOOGLE_NOIBAT
-	bool "->  Noibat (HP Chromebox G3)"
-
 config BOARD_GOOGLE_PALKIA
 	bool "->  Palkia"
-
-config BOARD_GOOGLE_PUFF
-	bool "->  Puff"
-
-config BOARD_GOOGLE_SCOUT
-	bool "->  Scout"
-
-config BOARD_GOOGLE_WYVERN
-	bool "->  Wyvern (CTL Chromebox CBx2)"
diff --git a/src/mainboard/google/hatch/chromeos-hatch-16MiB.fmd b/src/mainboard/google/hatch/chromeos-16MiB.fmd
index 8880a4f9fe..8880a4f9fe 100644
--- a/src/mainboard/google/hatch/chromeos-hatch-16MiB.fmd
+++ b/src/mainboard/google/hatch/chromeos-16MiB.fmd
diff --git a/src/mainboard/google/hatch/chromeos-hatch-32MiB.fmd b/src/mainboard/google/hatch/chromeos-32MiB.fmd
index 8368b0a44b..8368b0a44b 100644
--- a/src/mainboard/google/hatch/chromeos-hatch-32MiB.fmd
+++ b/src/mainboard/google/hatch/chromeos-32MiB.fmd
diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl
index 6320d06ecf..489ea2fa59 100644
--- a/src/mainboard/google/hatch/dsdt.asl
+++ b/src/mainboard/google/hatch/dsdt.asl
@@ -23,9 +23,7 @@ DefinitionBlock(
 		{
 			#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
 			#include <soc/intel/cannonlake/acpi/southbridge.asl>
-#if CONFIG(BOARD_GOOGLE_BASEBOARD_HATCH)
 			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
-#endif
 		}
 	}
 
@@ -40,7 +38,6 @@ DefinitionBlock(
 		#include <ec/google/chromeec/acpi/ec.asl>
 	}
 
-#if CONFIG(BOARD_GOOGLE_BASEBOARD_HATCH)
 	/* Dynamic Platform Thermal Framework */
 	Scope (\_SB)
 	{
@@ -49,5 +46,4 @@ DefinitionBlock(
 		/* Include common dptf ASL files */
 		#include <soc/intel/common/acpi/dptf/dptf.asl>
 	}
-#endif
 }
diff --git a/src/mainboard/google/hatch/romstage_spd_cbfs.c b/src/mainboard/google/hatch/romstage.c
index eb5153c133..eb5153c133 100644
--- a/src/mainboard/google/hatch/romstage_spd_cbfs.c
+++ b/src/mainboard/google/hatch/romstage.c
diff --git a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc b/src/mainboard/google/hatch/variants/baseboard/Makefile.inc
index 69f9322fb5..c0514376ac 100644
--- a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/baseboard/Makefile.inc
@@ -6,7 +6,6 @@ romstage-y += gpio.c
 romstage-y += memory.c
 
 ramstage-y += gpio.c
-ramstage-$(CONFIG_BOARD_GOOGLE_BASEBOARD_PUFF) += mainboard.c
 
 verstage-y += gpio.c
 
diff --git a/src/mainboard/google/puff/Kconfig b/src/mainboard/google/puff/Kconfig
new file mode 100644
index 0000000000..1fe0de525a
--- /dev/null
+++ b/src/mainboard/google/puff/Kconfig
@@ -0,0 +1,184 @@
+config BOARD_GOOGLE_BASEBOARD_PUFF
+	def_bool n
+	select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768
+	select DRIVERS_GENERIC_GPIO_KEYS
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_GENERIC
+	select DRIVERS_I2C_HID
+	select DRIVERS_I2C_SX9310
+	select DRIVERS_INTEL_DPTF
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select EC_GOOGLE_CHROMEEC
+	select EC_GOOGLE_CHROMEEC_BOARDID
+	select EC_GOOGLE_CHROMEEC_ESPI
+	select EC_GOOGLE_CHROMEEC_I2C_TUNNEL
+	select EC_GOOGLE_CHROMEEC_SKUID
+	select FW_CONFIG
+	select FW_CONFIG_SOURCE_CHROMEEC_CBI
+	select GOOGLE_SMBIOS_MAINBOARD_VERSION
+	select HAVE_ACPI_RESUME
+	select HAVE_ACPI_TABLES
+	select INTEL_LPSS_UART_FOR_CONSOLE
+	select MAINBOARD_HAS_CHROMEOS
+	select MAINBOARD_HAS_TPM2
+	select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
+	select RT8168_GEN_ACPI_POWER_RESOURCE
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select SOC_INTEL_COMETLAKE_1
+	select SOC_INTEL_COMMON_BLOCK_DTT
+	select SOC_INTEL_CSE_LITE_SKU
+	select SPD_CACHE_IN_FMAP
+	select SPD_READ_BY_WORD
+	select SPI_TPM
+	select TPM_GOOGLE_CR50
+
+config BOARD_GOOGLE_AMBASSADOR
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_DOOLY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_DUFFY_LEGACY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_DUFFY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_FAFFY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_GENESIS
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_KAISA_LEGACY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_KAISA
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_MOONBUGGY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_NOIBAT
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_PUFF
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_SCOUT
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_WYVERN
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+if BOARD_GOOGLE_BASEBOARD_PUFF
+
+config CHROMEOS
+	select EC_GOOGLE_CHROMEEC_SWITCHES
+	select GBB_FLAG_FORCE_DEV_BOOT_ALTFW
+	select GBB_FLAG_FORCE_DEV_BOOT_USB
+	select GBB_FLAG_FORCE_DEV_SWITCH_ON
+	select GBB_FLAG_FORCE_MANUAL_RECOVERY
+	select HAS_RECOVERY_MRC_CACHE
+	select VBOOT_LID_SWITCH
+	select CHROMEOS_CSE_BOARD_RESET_OVERRIDE
+
+config CHROMEOS_WIFI_SAR
+	bool "Enable SAR options for ChromeOS build"
+	depends on CHROMEOS
+	select DSAR_ENABLE
+	select GEO_SAR_ENABLE
+	select SAR_ENABLE
+	select USE_SAR
+
+config DEVICETREE
+	default "variants/baseboard/devicetree.cb"
+
+config DIMM_MAX
+	default 2
+
+config DRIVER_TPM_SPI_BUS
+	default 0x1
+
+config UART_FOR_CONSOLE
+	default 0
+
+config FMDFILE
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS
+	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS
+
+config POWER_OFF_ON_CR50_UPDATE
+	bool
+	default n
+
+config MAINBOARD_DIR
+	default "google/puff"
+
+config MAINBOARD_FAMILY
+	string
+	default "Google_Puff"
+
+config MAINBOARD_PART_NUMBER
+	default "Ambassador" if BOARD_GOOGLE_AMBASSADOR
+	default "Dooly" if BOARD_GOOGLE_DOOLY
+	default "Duffy" if BOARD_GOOGLE_DUFFY
+	default "Duffy" if BOARD_GOOGLE_DUFFY_LEGACY
+	default "Faffy" if BOARD_GOOGLE_FAFFY
+	default "Genesis" if BOARD_GOOGLE_GENESIS
+	default "Kaisa" if BOARD_GOOGLE_KAISA
+	default "Kaisa" if BOARD_GOOGLE_KAISA_LEGACY
+	default "Moonbuggy" if BOARD_GOOGLE_MOONBUGGY
+	default "Noibat" if BOARD_GOOGLE_NOIBAT
+	default "Puff" if BOARD_GOOGLE_PUFF
+	default "Scout" if BOARD_GOOGLE_SCOUT
+	default "Wyvern" if BOARD_GOOGLE_WYVERN
+
+config OVERRIDE_DEVICETREE
+	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
+
+config TPM_TIS_ACPI_INTERRUPT
+	int
+	default 53 # GPE0_DW1_21 (GPP_C21)
+
+config VARIANT_DIR
+	default "ambassador" if BOARD_GOOGLE_AMBASSADOR
+	default "dooly" if BOARD_GOOGLE_DOOLY
+	default "duffy" if BOARD_GOOGLE_DUFFY
+	default "duffy" if BOARD_GOOGLE_DUFFY_LEGACY
+	default "faffy" if BOARD_GOOGLE_FAFFY
+	default "genesis" if BOARD_GOOGLE_GENESIS
+	default "kaisa" if BOARD_GOOGLE_KAISA
+	default "kaisa" if BOARD_GOOGLE_KAISA_LEGACY
+	default "moonbuggy" if BOARD_GOOGLE_MOONBUGGY
+	default "noibat" if BOARD_GOOGLE_NOIBAT
+	default "puff" if BOARD_GOOGLE_PUFF
+	default "scout" if BOARD_GOOGLE_SCOUT
+	default "wyvern" if BOARD_GOOGLE_WYVERN
+
+config VBOOT
+	select HAS_RECOVERY_MRC_CACHE
+	select VBOOT_EARLY_EC_SYNC
+
+config USE_PM_ACPI_TIMER
+	default n
+
+config EDK2_BOOT_TIMEOUT
+	int
+	default 5
+
+endif # BOARD_GOOGLE_BASEBOARD_PUFF
diff --git a/src/mainboard/google/puff/Kconfig.name b/src/mainboard/google/puff/Kconfig.name
new file mode 100644
index 0000000000..5e2a365d39
--- /dev/null
+++ b/src/mainboard/google/puff/Kconfig.name
@@ -0,0 +1,40 @@
+comment "Puff"
+
+config BOARD_GOOGLE_AMBASSADOR
+	bool "->  Ambassador"
+
+config BOARD_GOOGLE_DOOLY
+	bool "->  Dooly"
+
+config BOARD_GOOGLE_DUFFY_LEGACY
+	bool "->  Duffy Legacy (32MB)"
+
+config BOARD_GOOGLE_DUFFY
+	bool "->  Duffy (ASUS Chromebox 4)"
+
+config BOARD_GOOGLE_FAFFY
+	bool "->  Faffy (ASUS Fanless Chromebox)"
+
+config BOARD_GOOGLE_GENESIS
+	bool "->  Genesis"
+
+config BOARD_GOOGLE_KAISA_LEGACY
+	bool "->  Kaisa Legacy (32MB)"
+
+config BOARD_GOOGLE_KAISA
+	bool "->  Kaisa (Acer Chromebox CXI4)"
+
+config BOARD_GOOGLE_MOONBUGGY
+	bool "->  Moonbuggy"
+
+config BOARD_GOOGLE_NOIBAT
+	bool "->  Noibat (HP Chromebox G3)"
+
+config BOARD_GOOGLE_PUFF
+	bool "->  Puff"
+
+config BOARD_GOOGLE_SCOUT
+	bool "->  Scout"
+
+config BOARD_GOOGLE_WYVERN
+	bool "->  Wyvern (CTL Chromebox CBx2)"
diff --git a/src/mainboard/google/puff/Makefile.inc b/src/mainboard/google/puff/Makefile.inc
new file mode 100644
index 0000000000..12d4374305
--- /dev/null
+++ b/src/mainboard/google/puff/Makefile.inc
@@ -0,0 +1,20 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+bootblock-y += bootblock.c
+bootblock-$(CONFIG_CHROMEOS) += chromeos.c
+
+ramstage-y += ramstage.c
+ramstage-$(CONFIG_CHROMEOS) += chromeos.c
+ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
+
+romstage-y += romstage.c
+romstage-$(CONFIG_CHROMEOS) += chromeos.c
+
+verstage-$(CONFIG_CHROMEOS) += chromeos.c
+
+subdirs-y += variants/baseboard
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
+
+VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
+subdirs-y += variants/$(VARIANT_DIR)
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/google/puff/board_info.txt b/src/mainboard/google/puff/board_info.txt
new file mode 100644
index 0000000000..1168548e9e
--- /dev/null
+++ b/src/mainboard/google/puff/board_info.txt
@@ -0,0 +1,6 @@
+Vendor name: Google
+Board name: Puff
+Category: desktop
+ROM protocol: SPI
+ROM socketed: n
+Flashrom support: y
diff --git a/src/mainboard/google/puff/bootblock.c b/src/mainboard/google/puff/bootblock.c
new file mode 100644
index 0000000000..6e2f34d10e
--- /dev/null
+++ b/src/mainboard/google/puff/bootblock.c
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+#include <bootblock_common.h>
+#include <soc/gpio.h>
+
+void bootblock_mainboard_early_init(void)
+{
+	const struct pad_config *variant_early_table;
+	size_t variant_gpios;
+
+	variant_early_table = variant_early_gpio_table(&variant_gpios);
+	gpio_configure_pads(variant_early_table, variant_gpios);
+}
diff --git a/src/mainboard/google/hatch/chromeos-puff-16MiB.fmd b/src/mainboard/google/puff/chromeos-16MiB.fmd
index 61a0b0fbb4..61a0b0fbb4 100644
--- a/src/mainboard/google/hatch/chromeos-puff-16MiB.fmd
+++ b/src/mainboard/google/puff/chromeos-16MiB.fmd
diff --git a/src/mainboard/google/hatch/chromeos-puff-32MiB.fmd b/src/mainboard/google/puff/chromeos-32MiB.fmd
index 81840b1e60..81840b1e60 100644
--- a/src/mainboard/google/hatch/chromeos-puff-32MiB.fmd
+++ b/src/mainboard/google/puff/chromeos-32MiB.fmd
diff --git a/src/mainboard/google/puff/chromeos.c b/src/mainboard/google/puff/chromeos.c
new file mode 100644
index 0000000000..9c5e19d879
--- /dev/null
+++ b/src/mainboard/google/puff/chromeos.c
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <bootmode.h>
+#include <boot/coreboot_tables.h>
+#include <ec/google/chromeec/ec.h>
+#include <gpio.h>
+#include <variant/gpio.h>
+#include <types.h>
+
+void fill_lb_gpios(struct lb_gpios *gpios)
+{
+	struct lb_gpio chromeos_gpios[] = {
+		{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
+		{-1, ACTIVE_HIGH, 0, "power"},
+		{-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"},
+		{GPIO_EC_IN_RW, ACTIVE_HIGH, gpio_get(GPIO_EC_IN_RW),
+		 "EC in RW"},
+	};
+	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
+}
+
+int get_write_protect_state(void)
+{
+	return gpio_get(GPIO_PCH_WP);
+}
+
+int get_ec_is_trusted(void)
+{
+	/* EC is trusted if not in RW. */
+	return !gpio_get(GPIO_EC_IN_RW);
+}
diff --git a/src/mainboard/google/puff/dsdt.asl b/src/mainboard/google/puff/dsdt.asl
new file mode 100644
index 0000000000..c7a5a070d4
--- /dev/null
+++ b/src/mainboard/google/puff/dsdt.asl
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpi.h>
+#include <variant/ec.h>
+#include <variant/gpio.h>
+
+DefinitionBlock(
+	"dsdt.aml",
+	"DSDT",
+	ACPI_DSDT_REV_2,
+	OEM_ID,
+	ACPI_TABLE_CREATOR,
+	0x20110725
+)
+{
+	#include <acpi/dsdt_top.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
+	#include <cpu/intel/common/acpi/cpu.asl>
+
+	Scope (\_SB) {
+		Device (PCI0)
+		{
+			#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
+			#include <soc/intel/cannonlake/acpi/southbridge.asl>
+		}
+	}
+
+	#include <southbridge/intel/common/acpi/sleepstates.asl>
+
+	/* ChromeOS Embedded Controller */
+	Scope (\_SB.PCI0.LPCB)
+	{
+		/* ACPI code for EC SuperIO functions */
+		#include <ec/google/chromeec/acpi/superio.asl>
+		/* ACPI code for EC functions */
+		#include <ec/google/chromeec/acpi/ec.asl>
+	}
+}
diff --git a/src/mainboard/google/puff/ec.c b/src/mainboard/google/puff/ec.c
new file mode 100644
index 0000000000..e25abb4ede
--- /dev/null
+++ b/src/mainboard/google/puff/ec.c
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpi.h>
+#include <ec/ec.h>
+#include <ec/google/chromeec/ec.h>
+#include <variant/ec.h>
+
+void mainboard_ec_init(void)
+{
+	const struct google_chromeec_event_info info = {
+		.log_events = MAINBOARD_EC_LOG_EVENTS,
+		.sci_events = MAINBOARD_EC_SCI_EVENTS,
+		.s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
+		.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
+		.s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,
+	};
+
+	google_chromeec_events_init(&info, acpi_is_wakeup_s3());
+}
diff --git a/src/mainboard/google/puff/ramstage.c b/src/mainboard/google/puff/ramstage.c
new file mode 100644
index 0000000000..ff466a34a8
--- /dev/null
+++ b/src/mainboard/google/puff/ramstage.c
@@ -0,0 +1,61 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+#include <ec/ec.h>
+#include <soc/gpio.h>
+#include <soc/ramstage.h>
+#include <variant/gpio.h>
+
+void mainboard_silicon_init_params(FSPS_UPD *supd)
+{
+	variant_devtree_update();
+}
+
+void __weak variant_devtree_update(void)
+{
+	/* Override dev tree settings per board */
+}
+
+void __weak variant_ramstage_init(void)
+{
+	/* Default weak implementation */
+}
+
+void __weak variant_mainboard_enable(struct device *dev)
+{
+	/* Override mainboard settings per board */
+}
+
+static void mainboard_init(struct device *dev)
+{
+	mainboard_ec_init();
+}
+
+static void mainboard_enable(struct device *dev)
+{
+	dev->ops->init = mainboard_init;
+	variant_mainboard_enable(dev);
+}
+
+static void mainboard_chip_init(void *chip_info)
+{
+	const struct pad_config *base_table;
+	const struct pad_config *override_table;
+	size_t base_gpios;
+	size_t override_gpios;
+
+	base_table = base_gpio_table(&base_gpios);
+	override_table = override_gpio_table(&override_gpios);
+
+	gpio_configure_pads_with_override(base_table,
+					base_gpios,
+					override_table,
+					override_gpios);
+
+	variant_ramstage_init();
+}
+
+struct chip_operations mainboard_ops = {
+	.init = mainboard_chip_init,
+	.enable_dev = mainboard_enable,
+};
diff --git a/src/mainboard/google/hatch/romstage_spd_smbus.c b/src/mainboard/google/puff/romstage.c
index 3d84e52448..3d84e52448 100644
--- a/src/mainboard/google/hatch/romstage_spd_smbus.c
+++ b/src/mainboard/google/puff/romstage.c
diff --git a/src/mainboard/google/puff/smihandler.c b/src/mainboard/google/puff/smihandler.c
new file mode 100644
index 0000000000..ceab9fa2ac
--- /dev/null
+++ b/src/mainboard/google/puff/smihandler.c
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#include <baseboard/variants.h>
+#include <cpu/x86/smm.h>
+#include <ec/google/chromeec/ec.h>
+#include <ec/google/chromeec/smm.h>
+#include <elog.h>
+#include <intelblocks/smihandler.h>
+#include <variant/ec.h>
+
+void mainboard_smi_espi_handler(void)
+{
+	chromeec_smi_process_events();
+}
+
+void mainboard_smi_sleep(u8 slp_typ)
+{
+	const struct pad_config *pads;
+	size_t num;
+
+	pads = variant_sleep_gpio_table(slp_typ, &num);
+	gpio_configure_pads(pads, num);
+
+	chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS,
+			MAINBOARD_EC_S5_WAKE_EVENTS);
+}
+
+int mainboard_smi_apmc(u8 apmc)
+{
+	chromeec_smi_apmc(apmc, MAINBOARD_EC_SCI_EVENTS,
+			MAINBOARD_EC_SMI_EVENTS);
+	return 0;
+}
+
+void elog_gsmi_cb_mainboard_log_wake_source(void)
+{
+	google_chromeec_log_events(MAINBOARD_EC_LOG_EVENTS |
+					MAINBOARD_EC_S0IX_WAKE_EVENTS);
+}
diff --git a/src/mainboard/google/hatch/variants/ambassador/Makefile.inc b/src/mainboard/google/puff/variants/ambassador/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/ambassador/Makefile.inc
+++ b/src/mainboard/google/puff/variants/ambassador/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/ambassador/gpio.c b/src/mainboard/google/puff/variants/ambassador/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/ambassador/gpio.c
+++ b/src/mainboard/google/puff/variants/ambassador/gpio.c
diff --git a/src/mainboard/google/hatch/variants/ambassador/include/variant/ec.h b/src/mainboard/google/puff/variants/ambassador/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/ambassador/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/ambassador/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/ambassador/include/variant/gpio.h b/src/mainboard/google/puff/variants/ambassador/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/ambassador/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/ambassador/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/ambassador/overridetree.cb b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
index b4f3609ba0..b4f3609ba0 100644
--- a/src/mainboard/google/hatch/variants/ambassador/overridetree.cb
+++ b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
diff --git a/src/mainboard/google/puff/variants/baseboard/Makefile.inc b/src/mainboard/google/puff/variants/baseboard/Makefile.inc
new file mode 100644
index 0000000000..e4641b977e
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/Makefile.inc
@@ -0,0 +1,13 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+bootblock-y += gpio.c
+
+romstage-y += gpio.c
+romstage-y += memory.c
+
+ramstage-y += gpio.c
+ramstage-y += mainboard.c
+
+verstage-y += gpio.c
+
+smm-y += gpio.c
diff --git a/src/mainboard/google/puff/variants/baseboard/devicetree.cb b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
new file mode 100644
index 0000000000..976d82970c
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
@@ -0,0 +1,355 @@
+chip soc/intel/cannonlake
+
+	# GPE configuration
+	# Note that GPE events called out in ASL code rely on this
+	# route. i.e. If this route changes then the affected GPE
+	# offset bits also need to be changed.
+	# DW1 is used by:
+	#   - GPP_C1  - PCIE_14_WLAN_WAKE_ODL
+	#   - GPP_C21 - H1_PCH_INT_ODL
+	register "gpe0_dw0" = "PMC_GPP_A"
+	register "gpe0_dw1" = "PMC_GPP_C"
+	register "gpe0_dw2" = "PMC_GPP_D"
+
+	# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
+	register "gen1_dec" = "0x00fc0801"
+	register "gen2_dec" = "0x000c0201"
+	# EC memory map range is 0x900-0x9ff
+	register "gen3_dec" = "0x00fc0901"
+
+	# FSP configuration
+	register "SkipExtGfxScan" = "1"
+	register "SataSalpSupport" = "1"
+	register "SataPortsEnable[1]" = "1"
+	register "SataPortsDevSlp[1]" = "1"
+	# Configure devslp pad reset to PLT_RST
+	register "SataPortsDevSlpResetConfig[1]" = "SataDevSlpPlatformReset"
+	register "satapwroptimize" = "1"
+	# Enable System Agent dynamic frequency
+	register "SaGv" = "SaGv_Enabled"
+	# Enable S0ix
+	register "s0ix_enable" = "1"
+	# Enable DPTF
+	register "dptf_enable" = "1"
+	register "power_limits_config" = "{
+		.tdp_pl1_override = 15,
+		.tdp_pl2_override = 64,
+	}"
+	register "Device4Enable" = "1"
+	# Enable eDP device
+	register "DdiPortEdp" = "1"
+	# Enable HPD for DDI ports B/C
+	register "DdiPortBHpd" = "1"
+	register "DdiPortCHpd" = "1"
+	register "tcc_offset" = "10"	# TCC of 90C
+	# Unlock GPIO pads
+	register "PchUnlockGpioPads" = "1"
+	# SD card WP pin configuration
+	register "ScsSdCardWpPinEnabled" = "0"
+
+	# NOTE: if any variant wants to override this value, use the same format
+	# as register "common_soc_config.pch_thermal_trip" = "value", instead of
+	# putting it under register "common_soc_config" in overridetree.cb file.
+	register "common_soc_config.pch_thermal_trip" = "77"
+
+	# Select CPU PL2/PL4 config
+	register "cpu_pl2_4_cfg" = "baseline"
+
+	# VR Settings Configuration for 4 Domains
+	#+----------------+-------+-------+-------+-------+
+	#| Domain/Setting |  SA   |  IA   | GTUS  |  GTS  |
+	#+----------------+-------+-------+-------+-------+
+	#| Psi1Threshold  | 20A   | 20A   | 20A   | 20A   |
+	#| Psi2Threshold  | 5A    | 5A    | 5A    | 5A    |
+	#| Psi3Threshold  | 1A    | 1A    | 1A    | 1A    |
+	#| Psi3Enable     | 1     | 1     | 1     | 1     |
+	#| Psi4Enable     | 1     | 1     | 1     | 1     |
+	#| ImonSlope      | 0     | 0     | 0     | 0     |
+	#| ImonOffset     | 0     | 0     | 0     | 0     |
+	#| IccMax         | 6A    | 70A   | 31A   | 31A   |
+	#| VrVoltageLimit | 1.52V | 1.52V | 1.52V | 1.52V |
+	#| AcLoadline     | 10.3  | 1.8   | 3.1   | 3.1   |
+	#| DcLoadline     | 10.3  | 1.8   | 3.1   | 3.1   |
+	#+----------------+-------+-------+-------+-------+
+	register "domain_vr_config[VR_SYSTEM_AGENT]" = "{
+		.vr_config_enable = 1,
+		.psi1threshold = VR_CFG_AMP(20),
+		.psi2threshold = VR_CFG_AMP(5),
+		.psi3threshold = VR_CFG_AMP(1),
+		.psi3enable = 1,
+		.psi4enable = 1,
+		.imon_slope = 0x0,
+		.imon_offset = 0x0,
+		.icc_max = 0,
+		.voltage_limit = 1520,
+		.ac_loadline = 1030,
+		.dc_loadline = 1030,
+	}"
+
+	register "domain_vr_config[VR_IA_CORE]" = "{
+		.vr_config_enable = 1,
+		.psi1threshold = VR_CFG_AMP(20),
+		.psi2threshold = VR_CFG_AMP(5),
+		.psi3threshold = VR_CFG_AMP(1),
+		.psi3enable = 1,
+		.psi4enable = 1,
+		.imon_slope = 0x0,
+		.imon_offset = 0x0,
+		.icc_max = 0,
+		.voltage_limit = 1520,
+		.ac_loadline = 180,
+		.dc_loadline = 180,
+	}"
+
+	register "domain_vr_config[VR_GT_UNSLICED]" = "{
+		.vr_config_enable = 1,
+		.psi1threshold = VR_CFG_AMP(20),
+		.psi2threshold = VR_CFG_AMP(5),
+		.psi3threshold = VR_CFG_AMP(1),
+		.psi3enable = 1,
+		.psi4enable = 1,
+		.imon_slope = 0x0,
+		.imon_offset = 0x0,
+		.icc_max = 0,
+		.voltage_limit = 1520,
+		.ac_loadline = 310,
+		.dc_loadline = 310,
+	}"
+
+	register "domain_vr_config[VR_GT_SLICED]" = "{
+		.vr_config_enable = 1,
+		.psi1threshold = VR_CFG_AMP(20),
+		.psi2threshold = VR_CFG_AMP(5),
+		.psi3threshold = VR_CFG_AMP(1),
+		.psi3enable = 1,
+		.psi4enable = 1,
+		.imon_slope = 0x0,
+		.imon_offset = 0x0,
+		.icc_max = 0,
+		.voltage_limit = 1520,
+		.ac_loadline = 310,
+		.dc_loadline = 310,
+	}"
+
+	register "PchPmSlpS3MinAssert" = "2"  # 50ms
+	register "PchPmSlpS4MinAssert" = "1"  # 1s
+	register "PchPmSlpSusMinAssert" = "1" # 500ms
+	register "PchPmSlpAMinAssert" = "3"   # 98ms
+
+	# NOTE: Duration programmed in the below register should never be smaller than the
+	# stretch duration programmed in the following registers -
+	#	- GEN_PMCON_A.SLP_S3_MIN_ASST_WDTH (PchPmSlpS3MinAssert)
+	#	- GEN_PMCON_A.S4MAW (PchPmSlpS4MinAssert)
+	#	- PM_CFG.SLP_A_MIN_ASST_WDTH (PchPmSlpAMinAssert)
+	#	- PM_CFG.SLP_LAN_MIN_ASST_WDTH
+	register "PchPmPwrCycDur" = "1"       # 1s
+
+	# Enable Audio DSP oscillator qualification for S0ix
+	register "cppmvric2_adsposcdis" = "1"
+
+	register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC2)"	# Type-C Port 0
+	register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC2)"	# Type-C Port 1
+	register "usb2_ports[2]" = "USB2_PORT_SHORT(OC3)"	# Type-A Port 0
+	register "usb2_ports[3]" = "USB2_PORT_LONG(OC3)"	# Type-A Port 1
+	register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"	# WWAN
+	register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)"	# Camera
+	register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)"	# BT
+
+	register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)"	# Type-C Port 0
+	register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)"	# Type-C Port 1
+	register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)"	# Type-A Port 0
+	register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC3)"	# Type-A Port 1
+	register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC_SKIP)"	# WWAN
+
+	# Enable Root port 9(x4) for NVMe.
+	register "PcieRpEnable[8]" = "1"
+	register "PcieRpLtrEnable[8]" = "1"
+	# RP 9 uses CLK SRC 1
+	register "PcieClkSrcUsage[1]" = "8"
+	# ClkReq-to-ClkSrc mapping for CLK SRC 1
+	register "PcieClkSrcClkReq[1]" = "1"
+
+	# PCIe port 14 for M.2 E-key WLAN
+	register "PcieRpEnable[13]" = "1"
+	register "PcieRpLtrEnable[13]" = "1"
+	# RP 14 uses CLK SRC 3
+	register "PcieClkSrcUsage[3]" = "13"
+	register "PcieClkSrcClkReq[3]" = "3"
+
+	#Enable I2S Audio, SSP0, SSP1 and DMIC0, default DMIC1 N/A (by variants override)
+	register "PchHdaDspEnable" = "1"
+	register "PchHdaAudioLinkSsp0" = "1"
+	register "PchHdaAudioLinkSsp1" = "1"
+	register "PchHdaAudioLinkDmic0" = "1"
+	register "PchHdaAudioLinkDmic1" = "0"
+
+	# GPIO PM programming
+	register "gpio_override_pm" = "1"
+
+	# GPIO community PM configuration
+	# Disable dynamic clock gating; with bits 0-5 set in these registers,
+	# some short interrupt pulses were missed (esp. cr50 irq)
+	register "gpio_pm[COMM_0]" = "0"
+	register "gpio_pm[COMM_1]" = "0"
+	register "gpio_pm[COMM_2]" = "0"
+	register "gpio_pm[COMM_3]" = "0"
+	register "gpio_pm[COMM_4]" = "0"
+
+	device cpu_cluster 0 on
+		device lapic 0 on end
+	end
+
+	device domain 0 on
+		device pci 00.0 on end # Host Bridge
+		device pci 02.0 on  end # Integrated Graphics Device
+		device pci 04.0 off end # SA Thermal device
+		device pci 05.0 off end # SA IPU
+		device pci 12.0 on end # Thermal Subsystem
+		device pci 12.5 off end # UFS SCS
+		device pci 12.6 off end # GSPI #2
+		device pci 14.0 on
+			chip drivers/usb/acpi
+				register "desc" = ""Root Hub""
+				register "type" = "UPC_TYPE_HUB"
+				device usb 0.0 on
+					chip drivers/usb/acpi
+						register "desc" = ""Left Type-C Port""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
+						device usb 2.0 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Right Type-C Port 1""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						device usb 2.1 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Left Type-A Port""
+						register "type" = "UPC_TYPE_A"
+						register "group" = "ACPI_PLD_GROUP(1, 2)"
+						device usb 2.2 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Right Type-A Port 1""
+						register "type" = "UPC_TYPE_A"
+						register "group" = "ACPI_PLD_GROUP(2, 2)"
+						device usb 2.3 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""WWAN""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.5 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Camera""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.6 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Bluetooth""
+						register "type" = "UPC_TYPE_INTERNAL"
+						register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)"
+						device usb 2.9 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Left Type-C Port""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
+						device usb 3.0 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Right Type-C Port 1""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						device usb 3.1 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Left Type-A Port""
+						register "type" = "UPC_TYPE_USB3_A"
+						register "group" = "ACPI_PLD_GROUP(1, 2)"
+						device usb 3.2 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Right Type-A Port 1""
+						register "type" = "UPC_TYPE_USB3_A"
+						register "group" = "ACPI_PLD_GROUP(2, 2)"
+						device usb 3.3 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""WWAN""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 3.4 on end
+					end
+				end
+			end
+		end # USB xHCI
+		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
+			chip drivers/wifi/generic
+				register "wake" = "GPE0_PME_B0"
+				device generic 0 on end
+			end
+		end # CNVi wifi
+		device pci 14.5 on  end # SDCard
+		device pci 15.0 on  end # I2C #0
+		device pci 15.1 on  end # I2C #1
+		device pci 15.2 on  end # I2C #2
+		device pci 15.3 on  end # I2C #3
+		device pci 16.0 on  end # Management Engine Interface 1
+		device pci 16.1 off end # Management Engine Interface 2
+		device pci 16.2 off end # Management Engine IDE-R
+		device pci 16.3 off end # Management Engine KT Redirection
+		device pci 16.4 off end # Management Engine Interface 3
+		device pci 16.5 off end # Management Engine Interface 4
+		device pci 17.0 on  end # SATA
+		device pci 19.0 on  end # I2C #4
+		device pci 19.1 off end # I2C #5
+		device pci 19.2 off end # UART #2
+		device pci 1a.0 off end # eMMC
+		device pci 1c.0 off end # PCI Express Port 1 (USB)
+		device pci 1c.1 off end # PCI Express Port 2 (USB)
+		device pci 1c.2 off end # PCI Express Port 3 (USB)
+		device pci 1c.3 off end # PCI Express Port 4 (USB)
+		device pci 1c.4 off end # PCI Express Port 5 (USB)
+		device pci 1c.5 off end # PCI Express Port 6
+		device pci 1c.6 off end # PCI Express Port 7
+		device pci 1c.7 off end # PCI Express Port 8
+		device pci 1d.0 on	# PCI Express Port 9 (X4 NVME)
+			register "PcieRpSlotImplemented[8]" = "1"
+		end
+		device pci 1d.1 off end # PCI Express Port 10
+		device pci 1d.2 off end # PCI Express Port 11
+		device pci 1d.3 off end # PCI Express Port 12
+		device pci 1d.4 off end # PCI Express port 13
+		device pci 1d.5 on
+			chip drivers/wifi/generic
+				register "wake" = "GPE0_DW1_01"
+				device pci 00.0 on  end
+			end
+			register "PcieRpSlotImplemented[13]" = "1"
+		end # PCI Express Port 14 (x4)
+		device pci 1e.0 on  end # UART #0
+		device pci 1e.1 off end # UART #1
+		device pci 1e.2 on
+			chip drivers/spi/acpi
+				register "hid" = "ACPI_DT_NAMESPACE_HID"
+				register "compat_string" = ""google,cr50""
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_C21_IRQ)"
+				device spi 0 on end
+			end
+		end # GSPI #0
+		device pci 1e.3 on end # GSPI #1
+		device pci 1f.0 on
+			chip ec/google/chromeec
+				device pnp 0c09.0 on end
+			end
+		end # eSPI Interface
+		device pci 1f.1 on  end # P2SB
+		device pci 1f.2 hidden end # Power Management Controller
+		device pci 1f.3 on  end # Intel HDA
+		device pci 1f.4 on  end # SMBus
+		device pci 1f.5 on  end # PCH SPI
+		device pci 1f.6 off end # GbE
+	end
+end
diff --git a/src/mainboard/google/puff/variants/baseboard/gpio.c b/src/mainboard/google/puff/variants/baseboard/gpio.c
new file mode 100644
index 0000000000..eab831aabf
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/gpio.c
@@ -0,0 +1,435 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpi.h>
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <types.h>
+#include <vendorcode/google/chromeos/chromeos.h>
+
+static const struct pad_config gpio_table[] = {
+	/* A0  : GPP_A0 ==> NC */
+	PAD_NC(GPP_A0, NONE),
+	/* A1  : ESPI_IO0 */
+	/* A2  : ESPI_IO1 */
+	/* A3  : ESPI_IO2 */
+	/* A4  : ESPI_IO3 */
+	/* A5  : ESPI_CS# */
+	/* A6  : GPP_A6 ==> NC */
+	PAD_NC(GPP_A6, NONE),
+	/* A7  : PP3300_SOC_A */
+	PAD_NC(GPP_A7, NONE),
+	/* A8  : GPP_A8 ==> NC */
+	PAD_NC(GPP_A8, NONE),
+	/* A9  : ESPI_CLK */
+	/* A10  : GPP_A10 ==> NC */
+	PAD_NC(GPP_A10, NONE),
+	/* A11  : GPP_A11 ==> NC */
+	PAD_NC(GPP_A11, NONE),
+	/* A12  : GPP_A12 ==> NC */
+	PAD_NC(GPP_A12, NONE),
+	/* A13 : SUSWARN_L */
+	PAD_CFG_NF(GPP_A13, NONE, DEEP, NF1),
+	/* A14 : ESPI_RST_L */
+	/* A15 : SUSACK_L */
+	PAD_CFG_NF(GPP_A15, NONE, DEEP, NF1),
+	/* A16 : SD_1P8_SEL => NC */
+	PAD_NC(GPP_A16, NONE),
+	/* A17 : EN_PP3300_SD_DX */
+	PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1),
+	/* A18 : EN_PP3300_WWAN */
+	PAD_CFG_GPO(GPP_A18, 1, DEEP),
+	/* A19 : WWAN_RADIO_DISABLE_1V8_ODL */
+	PAD_CFG_GPO(GPP_A19, 1, DEEP),
+	/* A20 : WLAN_INT_L */
+	PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST, LEVEL, INVERT),
+	/* A21 : TRACKPAD_INT_ODL */
+	PAD_CFG_GPI_IRQ_WAKE(GPP_A21, NONE, DEEP, LEVEL, INVERT),
+	/* A22 : FPMCU_PCH_BOOT0 */
+	PAD_CFG_GPO(GPP_A22, 0, DEEP),
+	/* A23 : FPMCU_PCH_INT_ODL */
+	PAD_CFG_GPI_IRQ_WAKE(GPP_A23, NONE, PLTRST, LEVEL, INVERT),
+
+	/* B0  : CORE_VID0 */
+	PAD_CFG_NF(GPP_B0, NONE, DEEP, NF1),
+	/* B1  : CORE_VID1 */
+	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
+	/* B2  : GPP_B2 ==> NC */
+	PAD_NC(GPP_B2, NONE),
+	/* B3  : GPP_B3 ==> NC */
+	PAD_NC(GPP_B3, NONE),
+	/* B4  : GPP_B4 ==> NC */
+	PAD_NC(GPP_B4, NONE),
+	/* B5  : GPP_B5 ==> NC */
+	PAD_NC(GPP_B5, NONE),
+	/* B6  : SRCCLKREQ1 */
+	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF1),
+	/* B7  : GPP_B7 ==> NC */
+	PAD_NC(GPP_B7, NONE),
+	/* B8  : PCIE_14_WLAN_CLKREQ_ODL */
+	PAD_CFG_NF(GPP_B8, NONE, DEEP, NF1),
+	/* B9  : GPP_B9 ==> NC */
+	PAD_NC(GPP_B9, NONE),
+	/* B10 : GPP_B10 ==> NC */
+	PAD_NC(GPP_B10, NONE),
+	/* B11 : EXT_PWR_GATE_L */
+	PAD_CFG_NF(GPP_B11, NONE, DEEP, NF1),
+	/* B12 : SLP_S0_L */
+	PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1),
+	/* B13 : PLT_RST_L */
+	PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1),
+	/* B14 : GPP_B14_STRAP */
+	PAD_NC(GPP_B14, NONE),
+	/* B15 : H1_SLAVE_SPI_CS_L */
+	PAD_CFG_NF(GPP_B15, NONE, DEEP, NF1),
+	/* B16 : H1_SLAVE_SPI_CLK */
+	PAD_CFG_NF(GPP_B16, NONE, DEEP, NF1),
+	/* B17 : H1_SLAVE_SPI_MISO_R */
+	PAD_CFG_NF(GPP_B17, NONE, DEEP, NF1),
+	/* B18 : H1_SLAVE_SPI_MOSI_R */
+	PAD_CFG_NF(GPP_B18, NONE, DEEP, NF1),
+	/* B19 : Set to NF1 to match FSP setting it to NF1, i.e., GSPI1_CS0# */
+	PAD_CFG_NF(GPP_B19, NONE, DEEP, NF1),
+	/* B20 : PCH_SPI_FPMCU_CLK_R */
+	PAD_CFG_NF(GPP_B20, NONE, DEEP, NF1),
+	/* B21 : PCH_SPI_FPMCU_MISO */
+	PAD_CFG_NF(GPP_B21, NONE, DEEP, NF1),
+	/* B22 : PCH_SPI_FPMCU_MOSI */
+	PAD_CFG_NF(GPP_B22, NONE, DEEP, NF1),
+	/* B23 : GPP_B23_STRAP */
+	PAD_NC(GPP_B23, NONE),
+
+	/* C0  : GPP_C0 => NC */
+	PAD_NC(GPP_C0, NONE),
+	/* C1  : PCIE_14_WLAN_WAKE_ODL */
+	PAD_CFG_GPI_SCI_LOW(GPP_C1, NONE, DEEP, EDGE_SINGLE),
+	/* C2  : GPP_C2 => NC */
+	PAD_NC(GPP_C2, NONE),
+	/* C3  : WLAN_OFF_L */
+	PAD_CFG_GPO(GPP_C3, 1, DEEP),
+	/* C4  : TOUCHSCREEN_DIS_L */
+	PAD_CFG_GPO(GPP_C4, 1, DEEP),
+	/* C5  : GPP_C5 => NC */
+	PAD_NC(GPP_C5, NONE),
+	/* C6  : PEN_PDCT_OD_L */
+	PAD_NC(GPP_C6, NONE),
+	/* C7  : PEN_IRQ_OD_L */
+	PAD_NC(GPP_C7, NONE),
+	/* C8  : UART_PCH_RX_DEBUG_TX */
+	PAD_CFG_NF(GPP_C8, NONE, DEEP, NF1),
+	/* C9  : UART_PCH_TX_DEBUG_RX */
+	PAD_CFG_NF(GPP_C9, NONE, DEEP, NF1),
+	/* C10 : GPP_10 ==> GPP_C10_TP */
+	PAD_NC(GPP_C10, NONE),
+	/* C11 : GPP_11 ==> EN_FP_RAILS */
+	PAD_CFG_GPO(GPP_C11, 0, DEEP),
+	/* C12 : GPP_C12 ==> NC */
+	PAD_NC(GPP_C12, NONE),
+	/* C13 : EC_PCH_INT_L */
+	PAD_CFG_GPI_APIC(GPP_C13, NONE, PLTRST, LEVEL, INVERT),
+	/* C14 : BT_DISABLE_L */
+	PAD_CFG_GPO(GPP_C14, 1, DEEP),
+	/* C15 : NC */
+	PAD_NC(GPP_C15, NONE),
+	/* C16 : PCH_I2C_TRACKPAD_SDA */
+	PAD_CFG_NF(GPP_C16, NONE, DEEP, NF1),
+	/* C17 : PCH_I2C_TRACKPAD_SCL */
+	PAD_CFG_NF(GPP_C17, NONE, DEEP, NF1),
+	/* C18 : PCH_I2C_TOUCHSCREEN_SDA */
+	PAD_CFG_NF(GPP_C18, NONE, DEEP, NF1),
+	/* C19 : PCH_I2C_TOUCHSCREEN_SCL */
+	PAD_CFG_NF(GPP_C19, NONE, DEEP, NF1),
+	/* C20 : PCH_WP_OD */
+	PAD_CFG_GPI(GPP_C20, NONE, DEEP),
+	/* C21 : H1_PCH_INT_ODL */
+	PAD_CFG_GPI_APIC(GPP_C21, NONE, PLTRST, LEVEL, INVERT),
+	/* C22 : EC_IN_RW_OD */
+	PAD_CFG_GPI(GPP_C22, NONE, DEEP),
+	/* C23 : WLAN_PE_RST# */
+	PAD_CFG_GPO(GPP_C23, 1, DEEP),
+
+	/* D0  : TP31 */
+	PAD_NC(GPP_D0, NONE),
+	/* D1  : TP16 */
+	PAD_NC(GPP_D1, NONE),
+	/* D2  : TP26 */
+	PAD_NC(GPP_D2, NONE),
+	/* D3  : TP27 */
+	PAD_NC(GPP_D3, NONE),
+	/* D4  : TP40 */
+	PAD_NC(GPP_D4, NONE),
+	/* D5  : WWAN_CONFIG_0 */
+	PAD_NC(GPP_D5, NONE),
+	/* D6  : WWAN_CONFIG_1 */
+	PAD_NC(GPP_D6, NONE),
+	/* D7  : WWAN_CONFIG_2 */
+	PAD_NC(GPP_D7, NONE),
+	/* D8  : WWAN_CONFIG_3 */
+	PAD_NC(GPP_D8, NONE),
+	/* D9  : GPP_D9 ==> EN_PP3300_DX_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_D9, 0, DEEP),
+	/* D10 : GPP_D10 ==> NC */
+	PAD_NC(GPP_D10, NONE),
+	/* D11 : GPP_D11 ==> NC */
+	PAD_NC(GPP_D11, NONE),
+	/* D12 : GPP_D12 */
+	PAD_NC(GPP_D12, NONE),
+	/* D13 : ISH_UART_RX */
+	PAD_NC(GPP_D13, NONE),
+	/* D14 : ISH_UART_TX */
+	PAD_NC(GPP_D14, NONE),
+	/* D15 : TOUCHSCREEN_RST_L */
+	PAD_CFG_GPO(GPP_D15, 0, DEEP),
+	/* D16 : USI_INT */
+	PAD_CFG_GPI_APIC(GPP_D16, NONE, PLTRST, LEVEL, NONE),
+	/* D17 : PCH_HP_SDW_CLK */
+	PAD_NC(GPP_D17, NONE),
+	/* D18 : PCH_HP_SDW_DAT */
+	PAD_NC(GPP_D18, NONE),
+	/* D19 : DMIC_CLK_0_SNDW4_CLK */
+	PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1),
+	/* D20 : DMIC_DATA_0_SNDW4_DATA */
+	PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1),
+	/* D21 : GPP_D21 ==> NC */
+	PAD_NC(GPP_D21, NONE),
+	/* D22 : GPP_D22 ==> NC */
+	PAD_NC(GPP_D22, NONE),
+	/* D23 : SPP_MCLK */
+	PAD_CFG_NF(GPP_D23, NONE, DEEP, NF1),
+
+	/* E0  : GPP_E0 ==> NC */
+	PAD_NC(GPP_E0, NONE),
+	/* E1  : M2_SSD_PEDET */
+	PAD_CFG_NF(GPP_E1, NONE, DEEP, NF1),
+	/* E2  : GPP_E2 ==> NC */
+	PAD_NC(GPP_E2, NONE),
+	/* E3  : GPP_E3 ==> NC */
+	PAD_NC(GPP_E3, NONE),
+	/* E4  : M2_SSD_PE_WAKE_ODL */
+	PAD_CFG_GPI(GPP_E4, NONE, DEEP),
+	/* E5  : SATA_DEVSLP1 */
+	PAD_CFG_NF(GPP_E5, NONE, PLTRST, NF1),
+	/* E6  : M2_SSD_RST_L */
+	PAD_NC(GPP_E6, NONE),
+	/* E7  : GPP_E7 ==> NC */
+	PAD_NC(GPP_E7, NONE),
+	/* E8  : GPP_E8 ==> NC */
+	PAD_NC(GPP_E8, NONE),
+	/* E9  : GPP_E9 ==> NC */
+	PAD_NC(GPP_E9, NONE),
+	/* E10 : GPP_E10 ==> NC */
+	PAD_NC(GPP_E10, NONE),
+	/* E11 : USB_C_OC_OD USB_OC2 */
+	PAD_CFG_NF(GPP_E11, NONE, DEEP, NF1),
+	/* E12 : USB_A_OC_OD USB_OC3 */
+	PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
+	/* E13 : USB_C0_DP_HPD */
+	PAD_CFG_NF(GPP_E13, NONE, DEEP, NF1),
+	/* E14 : DDI2_HPD_ODL */
+	PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),
+	/* E15 : DDPD_HPD2 =>  NC */
+	PAD_NC(GPP_E15, NONE),
+	/* E16 : DDPE_HPD2 => NC */
+	PAD_NC(GPP_E16, NONE),
+	/* E17 : EDP_HPD */
+	PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1),
+	/* E18 : DDPB_CTRLCLK => NC */
+	PAD_NC(GPP_E18, NONE),
+	/* E19 : GPP_E19_STRAP */
+	PAD_CFG_GPI(GPP_E19, NONE, DEEP),
+	/* E20 : DDPC_CTRLCLK => NC */
+	PAD_NC(GPP_E20, NONE),
+	/* E21 : GPP_E21_STRAP */
+	PAD_CFG_GPI(GPP_E21, NONE, DEEP),
+	/* E22 : DDPD_CTRLCLK => NC */
+	PAD_NC(GPP_E22, NONE),
+	/* E23 : GPP_E23_STRAP */
+	PAD_NC(GPP_E23, NONE),
+
+	/* F0  : GPIO_WWAN_WLAN_COEX3 */
+	PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1),
+	/* F1  : WWAN_RESET_1V8_ODL */
+	PAD_CFG_GPO(GPP_F1, 1, DEEP),
+	/* F2  : MEM_CH_SEL */
+	PAD_CFG_GPI(GPP_F2, NONE, PLTRST),
+	/* F3  : GPP_F3 ==> NC */
+	PAD_NC(GPP_F3, NONE),
+	/* F4  : CNV_BRI_DT */
+	PAD_CFG_NF(GPP_F4, NONE, DEEP, NF1),
+	/* F5  : CNV_BRI_RSP */
+	PAD_CFG_NF(GPP_F5, NONE, DEEP, NF1),
+	/* F6  : CNV_RGI_DT */
+	PAD_CFG_NF(GPP_F6, NONE, DEEP, NF1),
+	/* F7  : CNV_RGI_RSP */
+	PAD_CFG_NF(GPP_F7, NONE, DEEP, NF1),
+	/* F8  : UART_WWANTX_WLANRX_COEX1 */
+	PAD_CFG_NF(GPP_F8, NONE, DEEP, NF1),
+	/* F9  : UART_WWANRX_WLANTX_COEX2 */
+	PAD_CFG_NF(GPP_F9, NONE, DEEP, NF1),
+	/* F10 : GPP_F10 ==> NC */
+	PAD_NC(GPP_F10, NONE),
+	/* F11 : PCH_MEM_STRAP2 */
+	PAD_CFG_GPI(GPP_F11, NONE, PLTRST),
+	/* F12 : GPP_F12 ==> NC */
+	PAD_NC(GPP_F12, NONE),
+	/* F13 : GPP_F13 ==> NC */
+	PAD_NC(GPP_F13, NONE),
+	/* F14 : GPP_F14 ==> NC */
+	PAD_NC(GPP_F14, NONE),
+	/* F15 : GPP_F15 ==> NC */
+	PAD_NC(GPP_F15, NONE),
+	/* F16 : GPP_F16 ==> NC */
+	PAD_NC(GPP_F16, NONE),
+	/* F17 : GPP_F17 ==> NC */
+	PAD_NC(GPP_F17, NONE),
+	/* F18 : GPP_F18 ==> NC */
+	PAD_NC(GPP_F18, NONE),
+	/* F19 : GPP_F19 ==> NC */
+	PAD_NC(GPP_F19, NONE),
+	/* F20 : PCH_MEM_STRAP0 */
+	PAD_CFG_GPI(GPP_F20, NONE, PLTRST),
+	/* F21 : PCH_MEM_STRAP1 */
+	PAD_CFG_GPI(GPP_F21, NONE, PLTRST),
+	/* F22 : PCH_MEM_STRAP3 */
+	PAD_CFG_GPI(GPP_F22, NONE, PLTRST),
+	/* F23 : GPP_F23 ==> NC */
+	PAD_NC(GPP_F23, NONE),
+
+	/* G0  : SD_CMD */
+	PAD_CFG_NF(GPP_G0, NATIVE, DEEP, NF1),
+	/* G1  : SD_DATA0 */
+	PAD_CFG_NF(GPP_G1, NATIVE, DEEP, NF1),
+	/* G2  : SD_DATA1 */
+	PAD_CFG_NF(GPP_G2, NATIVE, DEEP, NF1),
+	/* G3  : SD_DATA2 */
+	PAD_CFG_NF(GPP_G3, NATIVE, DEEP, NF1),
+	/* G4  : SD_DATA3 */
+	PAD_CFG_NF(GPP_G4, NATIVE, DEEP, NF1),
+	/* G5  : SD_CD# */
+	PAD_CFG_NF(GPP_G5, NONE, PLTRST, NF1),
+	/* G6  : SD_CLK */
+	PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
+	/* G7  : SD_WP
+	 * As per schematics SD host controller SD_WP pin is not connected to
+	 * uSD card connector. In order to overcome gpio default state, ensures
+	 * to configure gpio pin as NF1 with internal 20K pull down.
+	 */
+	PAD_CFG_NF(GPP_G7, DN_20K, DEEP, NF1),
+	/*
+	 * H0  : HP_INT_L
+	 */
+	PAD_CFG_GPI_INT(GPP_H0, NONE, PLTRST, EDGE_BOTH),
+	/* H1  : CNV_RF_RESET_L */
+	PAD_CFG_NF(GPP_H1, NONE, DEEP, NF3),
+	/* H2  : CNV_CLKREQ0 */
+	PAD_CFG_NF(GPP_H2, NONE, DEEP, NF3),
+	/* H3 : GPP_H3 ==> NC */
+	PAD_NC(GPP_H3, NONE),
+	/* H4  : PCH_I2C_PEN_SDA */
+	PAD_NC(GPP_H4, NONE),
+	/* H5  : PCH_I2C_PEN_SCL */
+	PAD_NC(GPP_H5, NONE),
+	/* H6  : PCH_I2C_SAR0_MST_SDA */
+	PAD_CFG_NF(GPP_H6, NONE, DEEP, NF1),
+	/* H7  : PCH_I2C_SAR0_MST_SCL */
+	PAD_CFG_NF(GPP_H7, NONE, DEEP, NF1),
+	/* H8  : PCH_I2C_M2_AUDIO_SAR1_SDA */
+	PAD_CFG_NF(GPP_H8, NONE, DEEP, NF1),
+	/* H9  : PCH_I2C_M2_AUDIO_SAR1_SCL */
+	PAD_CFG_NF(GPP_H9, NONE, DEEP, NF1),
+	/* H10 : PCH_I2C_TRACKPAD_SDA */
+	PAD_NC(GPP_H10, NONE),
+	/* H11 : PCH_I2C_TRACKPAD_SCL */
+	PAD_NC(GPP_H11, NONE),
+	/* H12 : GPP_H12 ==> NC */
+	PAD_NC(GPP_H12, NONE),
+	/* H13 : GPP_H13 ==> NC */
+	PAD_NC(GPP_H13, NONE),
+	/* H14 : GPP_H14 ==> NC */
+	PAD_NC(GPP_H14, NONE),
+	/* H15 : GPP_H15 ==> NC */
+	PAD_NC(GPP_H15, NONE),
+	/* H16 : GPP_H16 ==> NC */
+	PAD_NC(GPP_H16, NONE),
+	/* H17 : TP1 */
+	PAD_NC(GPP_H17, NONE),
+	/* H18 : CPU_C10_GATE_L */
+	PAD_CFG_NF(GPP_H18, NONE, DEEP, NF1),
+	/* H19 : GPP_H19 ==> NC */
+	PAD_NC(GPP_H19, NONE),
+	/* H20 : TP41 */
+	PAD_NC(GPP_H20, NONE),
+	/* H21 : XTAL_FREQ_SEL */
+	PAD_NC(GPP_H21, NONE),
+	/* H22 : GPP_H22 ==> NC */
+	PAD_NC(GPP_H22, NONE),
+	/* H23 : GPP_H23_STRAP */
+	PAD_NC(GPP_H23, NONE),
+
+	/* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_ODL */
+	PAD_CFG_NF(GPD2, NONE, DEEP, NF1),
+
+	/* SD card detect VGPIO */
+	PAD_CFG_GPI_GPIO_DRIVER(vSD3_CD_B, NONE, DEEP),
+
+	/* CNV_WCEN  : Disable Wireless Charging */
+	PAD_CFG_GPO(CNV_WCEN, 0, DEEP),
+};
+
+const struct pad_config *base_gpio_table(size_t *num)
+{
+	*num = ARRAY_SIZE(gpio_table);
+	return gpio_table;
+}
+
+/*
+ * Default GPIO settings before entering non-S5 sleep states.
+ * Configure A12: FPMCU_RST_ODL as GPO before entering sleep.
+ * This guarantees that A12's native3 function is disabled.
+ * See https://review.coreboot.org/c/coreboot/+/32111 .
+ */
+static const struct pad_config default_sleep_gpio_table[] = {
+	PAD_CFG_GPO(GPP_A12, 1, DEEP), /* FPMCU_RST_ODL */
+};
+
+/*
+ * GPIO settings before entering S5, which are same as
+ * default_sleep_gpio_table but also,
+ * turn off EN_PP3300_WWAN and FPMCU.
+ */
+static const struct pad_config s5_sleep_gpio_table[] = {
+	PAD_CFG_GPO(GPP_A12, 0, DEEP), /* FPMCU_RST_ODL */
+	PAD_CFG_GPO(GPP_C11, 0, DEEP), /* PCH_FP_PWR_EN */
+	PAD_CFG_GPO(GPP_A18, 0, DEEP), /* EN_PP3300_WWAN */
+};
+
+const struct pad_config *__weak variant_sleep_gpio_table(
+	u8 slp_typ, size_t *num)
+{
+	if (slp_typ == ACPI_S5) {
+		*num = ARRAY_SIZE(s5_sleep_gpio_table);
+		return s5_sleep_gpio_table;
+	}
+	*num = ARRAY_SIZE(default_sleep_gpio_table);
+	return default_sleep_gpio_table;
+}
+
+static const struct cros_gpio cros_gpios[] = {
+	CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME),
+	CROS_GPIO_WP_AH(GPIO_PCH_WP, CROS_GPIO_DEVICE_NAME),
+};
+
+DECLARE_WEAK_CROS_GPIOS(cros_gpios);
+
+/* Weak implementation of overrides */
+const struct pad_config *__weak override_gpio_table(size_t *num)
+{
+	*num = 0;
+	return NULL;
+}
+
+/* Weak implementation of early gpio */
+const struct pad_config *__weak variant_early_gpio_table(size_t *num)
+{
+	*num = 0;
+	return NULL;
+}
diff --git a/src/mainboard/google/puff/variants/baseboard/include/baseboard/acpi/dptf.asl b/src/mainboard/google/puff/variants/baseboard/include/baseboard/acpi/dptf.asl
new file mode 100644
index 0000000000..ef9b5694fa
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/include/baseboard/acpi/dptf.asl
@@ -0,0 +1,113 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#define DPTF_CPU_PASSIVE	95
+#define DPTF_CPU_CRITICAL	105
+#define DPTF_CPU_ACTIVE_AC0	87
+#define DPTF_CPU_ACTIVE_AC1	85
+#define DPTF_CPU_ACTIVE_AC2	83
+#define DPTF_CPU_ACTIVE_AC3	80
+#define DPTF_CPU_ACTIVE_AC4	75
+
+#define DPTF_TSR0_SENSOR_ID	0
+#define DPTF_TSR0_SENSOR_NAME	"Thermal Sensor 1"
+#define DPTF_TSR0_PASSIVE	65
+#define DPTF_TSR0_CRITICAL	75
+#define DPTF_TSR0_ACTIVE_AC0	50
+#define DPTF_TSR0_ACTIVE_AC1	47
+#define DPTF_TSR0_ACTIVE_AC2	45
+#define DPTF_TSR0_ACTIVE_AC3	42
+#define DPTF_TSR0_ACTIVE_AC4	39
+
+#define DPTF_TSR1_SENSOR_ID	1
+#define DPTF_TSR1_SENSOR_NAME	"Thermal Sensor 2"
+#define DPTF_TSR1_PASSIVE	65
+#define DPTF_TSR1_CRITICAL	75
+#define DPTF_TSR1_ACTIVE_AC0	50
+#define DPTF_TSR1_ACTIVE_AC1	47
+#define DPTF_TSR1_ACTIVE_AC2	45
+#define DPTF_TSR1_ACTIVE_AC3	42
+#define DPTF_TSR1_ACTIVE_AC4	39
+
+#define DPTF_ENABLE_CHARGER
+#define DPTF_ENABLE_FAN_CONTROL
+
+/* Charger performance states, board-specific values from charger and EC */
+Name (CHPS, Package () {
+	Package () { 0, 0, 0, 0, 255, 0x6a4, "mA", 0 },	/* 1.7A (MAX) */
+	Package () { 0, 0, 0, 0, 24, 0x600, "mA", 0 },	/* 1.5A */
+	Package () { 0, 0, 0, 0, 16, 0x400, "mA", 0 },	/* 1.0A */
+	Package () { 0, 0, 0, 0, 8, 0x200, "mA", 0 },	/* 0.5A */
+})
+
+/* DFPS: Fan Performance States */
+Name (DFPS, Package () {
+	0,	// Revision
+	/*
+	 * TODO : Need to update this Table after characterization.
+	 *	  These are initial reference values.
+	 */
+	/* Control, Trip Point, Speed, NoiseLevel, Power */
+	Package () {90,		0xFFFFFFFF,	6700,	220,	2200},
+	Package () {80,		0xFFFFFFFF,	5800,	180,	1800},
+	Package () {70,		0xFFFFFFFF,	5000,	145,	1450},
+	Package () {60,		0xFFFFFFFF,	4900,	115,	1150},
+	Package () {50,		0xFFFFFFFF,	3838,	90,	900},
+	Package () {40,		0xFFFFFFFF,	2904,	55,	550},
+	Package () {30,		0xFFFFFFFF,	2337,	30,	300},
+	Package () {20,		0xFFFFFFFF,	1608,	15,	150},
+	Package () {10,		0xFFFFFFFF,	800,	10,	100},
+	Package () {0,		0xFFFFFFFF,	0,	0,	50}
+})
+
+Name (DART, Package () {
+	/* Fan effect on CPU */
+	0,	// Revision
+	Package () {
+		/*
+		 * Source, Target, Weight, AC0, AC1, AC2, AC3, AC4, AC5, AC6,
+		 *	AC7, AC8, AC9
+		 */
+		\_SB.DPTF.TFN1, \_SB.PCI0.TCPU, 100, 90, 69, 56, 46, 36, 0, 0,
+			0, 0, 0
+	},
+	Package () {
+		\_SB.DPTF.TFN1, \_SB.DPTF.TSR0, 100, 90, 69, 56, 46, 36, 0, 0,
+			0, 0, 0
+	},
+	Package () {
+		\_SB.DPTF.TFN1, \_SB.DPTF.TSR1, 100, 90, 69, 56, 46, 36, 0, 0,
+			0, 0, 0
+	}
+})
+
+Name (DTRT, Package () {
+	/* CPU Throttle Effect on CPU */
+	Package () { \_SB.PCI0.TCPU, \_SB.PCI0.TCPU, 100, 50, 0, 0, 0, 0 },
+
+	/* CPU Throttle Effect on Ambient (TSR0) */
+	Package () { \_SB.PCI0.TCPU, \_SB.DPTF.TSR0, 100, 60, 0, 0, 0, 0 },
+
+	/* Charger Throttle Effect on Charger (TSR1) */
+	Package () { \_SB.DPTF.TCHG, \_SB.DPTF.TSR1, 100, 60, 0, 0, 0, 0 },
+})
+
+Name (MPPC, Package ()
+{
+	0x2,		/* Revision */
+	Package () {	/* Power Limit 1 */
+		0,	/* PowerLimitIndex, 0 for Power Limit 1 */
+		3000,	/* PowerLimitMinimum */
+		15000,	/* PowerLimitMaximum */
+		28000,	/* TimeWindowMinimum */
+		32000,	/* TimeWindowMaximum */
+		200	/* StepSize */
+	},
+	Package () {	/* Power Limit 2 */
+		1,	/* PowerLimitIndex, 1 for Power Limit 2 */
+		15000,	/* PowerLimitMinimum */
+		64000,	/* PowerLimitMaximum */
+		28000,	/* TimeWindowMinimum */
+		32000,	/* TimeWindowMaximum */
+		1000	/* StepSize */
+	}
+})
diff --git a/src/mainboard/google/puff/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/puff/variants/baseboard/include/baseboard/ec.h
new file mode 100644
index 0000000000..4760adc316
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/include/baseboard/ec.h
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __BASEBOARD_EC_H__
+#define __BASEBOARD_EC_H__
+
+#include <ec/google/chromeec/ec_commands.h>
+#include <variant/gpio.h>
+
+#define MAINBOARD_EC_SCI_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)        |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN)          |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED)      |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED)   |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_LOW)       |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL)  |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY)           |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS)    |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START)    |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP)     |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)            |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
+
+#define MAINBOARD_EC_SMI_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED))
+
+/* EC can wake from S5 with lid or power button */
+#define MAINBOARD_EC_S5_WAKE_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
+
+/*
+ * EC can wake from S3 with lid or power button or key press or
+ * mode change event.
+ */
+#define MAINBOARD_EC_S3_WAKE_EVENTS \
+	(MAINBOARD_EC_S5_WAKE_EVENTS |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP)        |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
+
+#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
+	(MAINBOARD_EC_S3_WAKE_EVENTS | \
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
+
+/* Log EC wake events plus EC shutdown events */
+#define MAINBOARD_EC_LOG_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
+
+/*
+ * ACPI related definitions for ASL code.
+ */
+
+/* Enable EC backed ALS device in ACPI */
+#define EC_ENABLE_ALS_DEVICE
+
+/* Enable EC backed PD MCU device in ACPI */
+#define EC_ENABLE_PD_MCU_DEVICE
+
+/* Enable LID switch and provide wake pin for EC */
+#define EC_ENABLE_LID_SWITCH
+#define EC_ENABLE_WAKE_PIN	GPE_EC_WAKE
+
+/* Enable Tablet switch */
+#define EC_ENABLE_TBMC_DEVICE
+
+#define SIO_EC_MEMMAP_ENABLE	/* EC Memory Map Resources */
+#define SIO_EC_HOST_ENABLE	/* EC Host Interface Resources */
+#define SIO_EC_ENABLE_PS2K      /* Enable PS/2 Keyboard */
+
+/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
+#define EC_ENABLE_SYNC_IRQ
+
+/* Enable EC backed Keyboard Backlight in ACPI */
+#define EC_ENABLE_KEYBOARD_BACKLIGHT
+
+#endif /* __BASEBOARD_EC_H__ */
diff --git a/src/mainboard/google/puff/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/puff/variants/baseboard/include/baseboard/gpio.h
new file mode 100644
index 0000000000..6c54978996
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/include/baseboard/gpio.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef BASEBOARD_GPIO_H
+#define BASEBOARD_GPIO_H
+
+#include <soc/gpio.h>
+
+#define GPIO_EC_IN_RW	        GPP_C22
+
+#define GPIO_PCH_WP	        GPP_C20
+
+/* EC wake pin is routed to GPD2/LAN_WAKE# on PCH */
+#define GPE_EC_WAKE		GPE0_LAN_WAK
+
+/* eSPI virtual wire reporting */
+#define EC_SCI_GPI		GPE0_ESPI
+
+/* EC sync irq is GPP_C13_IRQ */
+#define EC_SYNC_IRQ             GPP_C13_IRQ
+
+#endif /* BASEBOARD_GPIO_H */
diff --git a/src/mainboard/google/puff/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/puff/variants/baseboard/include/baseboard/variants.h
new file mode 100644
index 0000000000..125f7388a1
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/include/baseboard/variants.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef BASEBOARD_VARIANTS_H
+#define BASEBOARD_VARIANTS_H
+
+#include <soc/cnl_memcfg_init.h>
+#include <soc/gpio.h>
+#include <stdint.h>
+
+/*
+ * The next set of functions return the gpio table and fill in the number of
+ * entries for each table.  The "base" GPIOs live in the "baseboard" variant, and
+ * the overrides live with the specific board (kohaku, kled, etc.).
+*/
+const struct pad_config *base_gpio_table(size_t *num);
+const struct pad_config *override_gpio_table(size_t *num);
+
+/* Return board specific memory configuration */
+void variant_memory_params(struct cnl_mb_cfg *bcfg);
+
+/* Return memory SKU for the variant */
+int variant_memory_sku(void);
+
+/* Return variant specific gpio pads to be configured during sleep */
+const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num);
+
+/* Return GPIO pads that need to be configured before ramstage */
+const struct pad_config *variant_early_gpio_table(size_t *num);
+
+/* Modify devictree settings during ramstage. */
+void variant_devtree_update(void);
+
+/* Perform variant specific initialization early on in ramstage. */
+void variant_ramstage_init(void);
+
+/* Perform variant specific mainboard initialization */
+void variant_mainboard_enable(struct device *dev);
+
+#endif /* BASEBOARD_VARIANTS_H */
diff --git a/src/mainboard/google/puff/variants/baseboard/include/puff/ec.h b/src/mainboard/google/puff/variants/baseboard/include/puff/ec.h
new file mode 100644
index 0000000000..986cf61c05
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/include/puff/ec.h
@@ -0,0 +1,59 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __BASEBOARD_EC_H__
+#define __BASEBOARD_EC_H__
+
+#include <ec/google/chromeec/ec_commands.h>
+#include <variant/gpio.h>
+
+#define MAINBOARD_EC_SCI_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED)      |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED)   |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START)    |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP)     |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)            |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
+
+#define MAINBOARD_EC_SMI_EVENTS 0
+
+/* EC can wake from S5 with power button */
+#define MAINBOARD_EC_S5_WAKE_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
+
+/* EC can wake from S3 with power button */
+#define MAINBOARD_EC_S3_WAKE_EVENTS (MAINBOARD_EC_S5_WAKE_EVENTS)
+
+#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
+	(MAINBOARD_EC_S3_WAKE_EVENTS | \
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
+
+/* Log EC wake events plus EC shutdown events */
+#define MAINBOARD_EC_LOG_EVENTS \
+	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
+	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
+
+/*
+ * ACPI related definitions for ASL code.
+ */
+
+/* Enable cros_ec_keyb device */
+#define EC_ENABLE_MKBP_DEVICE
+
+/* Enable EC backed PD MCU device in ACPI */
+#define EC_ENABLE_PD_MCU_DEVICE
+
+/*
+ * Defines EC wake pin route.
+ * Note that GPE_EC_WAKE is defined, confusingly, as GPE_LAN_WAK which is GPD2/LAN_WAKE#
+ * on the PCH or as the line EC_PCH_WAKE_ODL on the schematic.
+ */
+#define EC_ENABLE_WAKE_PIN	GPE_EC_WAKE
+
+#define SIO_EC_MEMMAP_ENABLE	/* EC Memory Map Resources */
+#define SIO_EC_HOST_ENABLE	/* EC Host Interface Resources */
+
+/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
+#define EC_ENABLE_SYNC_IRQ
+
+#endif /* __BASEBOARD_EC_H__ */
diff --git a/src/mainboard/google/hatch/variants/baseboard/mainboard.c b/src/mainboard/google/puff/variants/baseboard/mainboard.c
index e0c344064c..e0c344064c 100644
--- a/src/mainboard/google/hatch/variants/baseboard/mainboard.c
+++ b/src/mainboard/google/puff/variants/baseboard/mainboard.c
diff --git a/src/mainboard/google/puff/variants/baseboard/memory.c b/src/mainboard/google/puff/variants/baseboard/memory.c
new file mode 100644
index 0000000000..5df73333a6
--- /dev/null
+++ b/src/mainboard/google/puff/variants/baseboard/memory.c
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+#include <baseboard/gpio.h>
+#include <soc/cnl_memcfg_init.h>
+#include <string.h>
+
+static const struct cnl_mb_cfg baseboard_memcfg = {
+	/* Baseboard uses 121, 81 and 100 rcomp resistors */
+	.rcomp_resistor = {121, 81, 100},
+
+	/* Baseboard Rcomp target values */
+	.rcomp_targets = {100, 40, 20, 20, 26},
+
+	/* Set CaVref config to 2 */
+	.vref_ca_config = 2,
+
+	/* Enable Early Command Training */
+	.ect = 1,
+};
+
+void __weak variant_memory_params(struct cnl_mb_cfg *bcfg)
+{
+	memcpy(bcfg, &baseboard_memcfg, sizeof(baseboard_memcfg));
+}
diff --git a/src/mainboard/google/hatch/variants/dooly/Makefile.inc b/src/mainboard/google/puff/variants/dooly/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/dooly/Makefile.inc
+++ b/src/mainboard/google/puff/variants/dooly/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/dooly/data.vbt b/src/mainboard/google/puff/variants/dooly/data.vbt
index 42fc269659..42fc269659 100644
--- a/src/mainboard/google/hatch/variants/dooly/data.vbt
+++ b/src/mainboard/google/puff/variants/dooly/data.vbt
diff --git a/src/mainboard/google/hatch/variants/dooly/gpio.c b/src/mainboard/google/puff/variants/dooly/gpio.c
index 37cd08cdae..37cd08cdae 100644
--- a/src/mainboard/google/hatch/variants/dooly/gpio.c
+++ b/src/mainboard/google/puff/variants/dooly/gpio.c
diff --git a/src/mainboard/google/hatch/variants/dooly/include/variant/ec.h b/src/mainboard/google/puff/variants/dooly/include/variant/ec.h
index 7d280c6edf..7d280c6edf 100644
--- a/src/mainboard/google/hatch/variants/dooly/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/dooly/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/dooly/include/variant/gpio.h b/src/mainboard/google/puff/variants/dooly/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/dooly/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/dooly/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/dooly/overridetree.cb b/src/mainboard/google/puff/variants/dooly/overridetree.cb
index 8533f024ea..8533f024ea 100644
--- a/src/mainboard/google/hatch/variants/dooly/overridetree.cb
+++ b/src/mainboard/google/puff/variants/dooly/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/duffy/Makefile.inc b/src/mainboard/google/puff/variants/duffy/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/duffy/Makefile.inc
+++ b/src/mainboard/google/puff/variants/duffy/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/duffy/data.vbt b/src/mainboard/google/puff/variants/duffy/data.vbt
index cda1c25d7d..cda1c25d7d 100644
--- a/src/mainboard/google/hatch/variants/duffy/data.vbt
+++ b/src/mainboard/google/puff/variants/duffy/data.vbt
diff --git a/src/mainboard/google/hatch/variants/duffy/gpio.c b/src/mainboard/google/puff/variants/duffy/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/duffy/gpio.c
+++ b/src/mainboard/google/puff/variants/duffy/gpio.c
diff --git a/src/mainboard/google/hatch/variants/duffy/include/variant/ec.h b/src/mainboard/google/puff/variants/duffy/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/duffy/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/duffy/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/duffy/include/variant/gpio.h b/src/mainboard/google/puff/variants/duffy/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/duffy/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/duffy/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/duffy/overridetree.cb b/src/mainboard/google/puff/variants/duffy/overridetree.cb
index 25778f92cb..25778f92cb 100644
--- a/src/mainboard/google/hatch/variants/duffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/duffy/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/faffy/Makefile.inc b/src/mainboard/google/puff/variants/faffy/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/faffy/Makefile.inc
+++ b/src/mainboard/google/puff/variants/faffy/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/faffy/data.vbt b/src/mainboard/google/puff/variants/faffy/data.vbt
index cda1c25d7d..cda1c25d7d 100644
--- a/src/mainboard/google/hatch/variants/faffy/data.vbt
+++ b/src/mainboard/google/puff/variants/faffy/data.vbt
diff --git a/src/mainboard/google/hatch/variants/faffy/gpio.c b/src/mainboard/google/puff/variants/faffy/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/faffy/gpio.c
+++ b/src/mainboard/google/puff/variants/faffy/gpio.c
diff --git a/src/mainboard/google/hatch/variants/faffy/include/variant/ec.h b/src/mainboard/google/puff/variants/faffy/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/faffy/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/faffy/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/faffy/include/variant/gpio.h b/src/mainboard/google/puff/variants/faffy/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/faffy/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/faffy/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/faffy/overridetree.cb b/src/mainboard/google/puff/variants/faffy/overridetree.cb
index 1ac9414c6a..1ac9414c6a 100644
--- a/src/mainboard/google/hatch/variants/faffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/faffy/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/genesis/Makefile.inc b/src/mainboard/google/puff/variants/genesis/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/genesis/Makefile.inc
+++ b/src/mainboard/google/puff/variants/genesis/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/genesis/gpio.c b/src/mainboard/google/puff/variants/genesis/gpio.c
index 66a1b8aec1..66a1b8aec1 100644
--- a/src/mainboard/google/hatch/variants/genesis/gpio.c
+++ b/src/mainboard/google/puff/variants/genesis/gpio.c
diff --git a/src/mainboard/google/hatch/variants/genesis/include/variant/ec.h b/src/mainboard/google/puff/variants/genesis/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/genesis/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/genesis/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/genesis/include/variant/gpio.h b/src/mainboard/google/puff/variants/genesis/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/genesis/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/genesis/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/genesis/overridetree.cb b/src/mainboard/google/puff/variants/genesis/overridetree.cb
index b42ca911bc..b42ca911bc 100644
--- a/src/mainboard/google/hatch/variants/genesis/overridetree.cb
+++ b/src/mainboard/google/puff/variants/genesis/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/kaisa/Makefile.inc b/src/mainboard/google/puff/variants/kaisa/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/kaisa/Makefile.inc
+++ b/src/mainboard/google/puff/variants/kaisa/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/kaisa/data.vbt b/src/mainboard/google/puff/variants/kaisa/data.vbt
index cda1c25d7d..cda1c25d7d 100644
--- a/src/mainboard/google/hatch/variants/kaisa/data.vbt
+++ b/src/mainboard/google/puff/variants/kaisa/data.vbt
diff --git a/src/mainboard/google/hatch/variants/kaisa/gpio.c b/src/mainboard/google/puff/variants/kaisa/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/kaisa/gpio.c
+++ b/src/mainboard/google/puff/variants/kaisa/gpio.c
diff --git a/src/mainboard/google/hatch/variants/kaisa/include/variant/ec.h b/src/mainboard/google/puff/variants/kaisa/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/kaisa/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/kaisa/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/kaisa/include/variant/gpio.h b/src/mainboard/google/puff/variants/kaisa/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/kaisa/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/kaisa/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/kaisa/overridetree.cb b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
index 50c6d0b1b1..50c6d0b1b1 100644
--- a/src/mainboard/google/hatch/variants/kaisa/overridetree.cb
+++ b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/moonbuggy/Makefile.inc b/src/mainboard/google/puff/variants/moonbuggy/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/moonbuggy/Makefile.inc
+++ b/src/mainboard/google/puff/variants/moonbuggy/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/moonbuggy/gpio.c b/src/mainboard/google/puff/variants/moonbuggy/gpio.c
index d8f392028d..d8f392028d 100644
--- a/src/mainboard/google/hatch/variants/moonbuggy/gpio.c
+++ b/src/mainboard/google/puff/variants/moonbuggy/gpio.c
diff --git a/src/mainboard/google/hatch/variants/moonbuggy/include/variant/ec.h b/src/mainboard/google/puff/variants/moonbuggy/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/moonbuggy/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/moonbuggy/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/moonbuggy/include/variant/gpio.h b/src/mainboard/google/puff/variants/moonbuggy/include/variant/gpio.h
index 9dd243400d..9dd243400d 100644
--- a/src/mainboard/google/hatch/variants/moonbuggy/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/moonbuggy/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/moonbuggy/overridetree.cb b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
index 1049805700..1049805700 100644
--- a/src/mainboard/google/hatch/variants/moonbuggy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/noibat/Makefile.inc b/src/mainboard/google/puff/variants/noibat/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/noibat/Makefile.inc
+++ b/src/mainboard/google/puff/variants/noibat/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/noibat/data.vbt b/src/mainboard/google/puff/variants/noibat/data.vbt
index cda1c25d7d..cda1c25d7d 100644
--- a/src/mainboard/google/hatch/variants/noibat/data.vbt
+++ b/src/mainboard/google/puff/variants/noibat/data.vbt
diff --git a/src/mainboard/google/hatch/variants/noibat/gpio.c b/src/mainboard/google/puff/variants/noibat/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/noibat/gpio.c
+++ b/src/mainboard/google/puff/variants/noibat/gpio.c
diff --git a/src/mainboard/google/hatch/variants/noibat/include/variant/ec.h b/src/mainboard/google/puff/variants/noibat/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/noibat/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/noibat/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/noibat/include/variant/gpio.h b/src/mainboard/google/puff/variants/noibat/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/noibat/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/noibat/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/noibat/overridetree.cb b/src/mainboard/google/puff/variants/noibat/overridetree.cb
index cf6046224c..cf6046224c 100644
--- a/src/mainboard/google/hatch/variants/noibat/overridetree.cb
+++ b/src/mainboard/google/puff/variants/noibat/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/puff/Makefile.inc b/src/mainboard/google/puff/variants/puff/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/puff/Makefile.inc
+++ b/src/mainboard/google/puff/variants/puff/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/puff/data.vbt b/src/mainboard/google/puff/variants/puff/data.vbt
index cda1c25d7d..cda1c25d7d 100644
--- a/src/mainboard/google/hatch/variants/puff/data.vbt
+++ b/src/mainboard/google/puff/variants/puff/data.vbt
diff --git a/src/mainboard/google/hatch/variants/puff/gpio.c b/src/mainboard/google/puff/variants/puff/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/puff/gpio.c
+++ b/src/mainboard/google/puff/variants/puff/gpio.c
diff --git a/src/mainboard/google/hatch/variants/puff/include/variant/ec.h b/src/mainboard/google/puff/variants/puff/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/puff/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/puff/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/puff/include/variant/gpio.h b/src/mainboard/google/puff/variants/puff/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/puff/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/puff/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/puff/overridetree.cb b/src/mainboard/google/puff/variants/puff/overridetree.cb
index 0d9bf7237e..0d9bf7237e 100644
--- a/src/mainboard/google/hatch/variants/puff/overridetree.cb
+++ b/src/mainboard/google/puff/variants/puff/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/scout/Makefile.inc b/src/mainboard/google/puff/variants/scout/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/scout/Makefile.inc
+++ b/src/mainboard/google/puff/variants/scout/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/scout/gpio.c b/src/mainboard/google/puff/variants/scout/gpio.c
index 55154364ac..55154364ac 100644
--- a/src/mainboard/google/hatch/variants/scout/gpio.c
+++ b/src/mainboard/google/puff/variants/scout/gpio.c
diff --git a/src/mainboard/google/hatch/variants/scout/include/variant/ec.h b/src/mainboard/google/puff/variants/scout/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/scout/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/scout/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/scout/include/variant/gpio.h b/src/mainboard/google/puff/variants/scout/include/variant/gpio.h
index 9dd243400d..9dd243400d 100644
--- a/src/mainboard/google/hatch/variants/scout/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/scout/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/scout/overridetree.cb b/src/mainboard/google/puff/variants/scout/overridetree.cb
index 8e6bc7714b..8e6bc7714b 100644
--- a/src/mainboard/google/hatch/variants/scout/overridetree.cb
+++ b/src/mainboard/google/puff/variants/scout/overridetree.cb
diff --git a/src/mainboard/google/hatch/variants/wyvern/Makefile.inc b/src/mainboard/google/puff/variants/wyvern/Makefile.inc
index 3b5b7d000d..3b5b7d000d 100644
--- a/src/mainboard/google/hatch/variants/wyvern/Makefile.inc
+++ b/src/mainboard/google/puff/variants/wyvern/Makefile.inc
diff --git a/src/mainboard/google/hatch/variants/wyvern/data.vbt b/src/mainboard/google/puff/variants/wyvern/data.vbt
index cda1c25d7d..cda1c25d7d 100644
--- a/src/mainboard/google/hatch/variants/wyvern/data.vbt
+++ b/src/mainboard/google/puff/variants/wyvern/data.vbt
diff --git a/src/mainboard/google/hatch/variants/wyvern/gpio.c b/src/mainboard/google/puff/variants/wyvern/gpio.c
index 996edc4fc7..996edc4fc7 100644
--- a/src/mainboard/google/hatch/variants/wyvern/gpio.c
+++ b/src/mainboard/google/puff/variants/wyvern/gpio.c
diff --git a/src/mainboard/google/hatch/variants/wyvern/include/variant/ec.h b/src/mainboard/google/puff/variants/wyvern/include/variant/ec.h
index 59fb3783c5..59fb3783c5 100644
--- a/src/mainboard/google/hatch/variants/wyvern/include/variant/ec.h
+++ b/src/mainboard/google/puff/variants/wyvern/include/variant/ec.h
diff --git a/src/mainboard/google/hatch/variants/wyvern/include/variant/gpio.h b/src/mainboard/google/puff/variants/wyvern/include/variant/gpio.h
index 79a141008f..79a141008f 100644
--- a/src/mainboard/google/hatch/variants/wyvern/include/variant/gpio.h
+++ b/src/mainboard/google/puff/variants/wyvern/include/variant/gpio.h
diff --git a/src/mainboard/google/hatch/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
index b9dd489cf2..b9dd489cf2 100644
--- a/src/mainboard/google/hatch/variants/wyvern/overridetree.cb
+++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb