summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2020-04-29 13:32:32 +1000
committerEdward O'Callaghan <quasisec@chromium.org>2020-05-20 01:11:17 +0000
commit64e15aac1b003ffde8db9969657a21f54f6c20f2 (patch)
tree12db4fce2ea2ea9c47621ba468fd2a977b96746d
parent66b9c0efb52f8953e52add59c70646fa1ce1b867 (diff)
downloadcoreboot-64e15aac1b003ffde8db9969657a21f54f6c20f2.tar.gz
coreboot-64e15aac1b003ffde8db9969657a21f54f6c20f2.tar.bz2
coreboot-64e15aac1b003ffde8db9969657a21f54f6c20f2.zip
mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
Originally variants make use of a 32MB chip whereas now they use a 16MB SPI flash. Allow for the coordination of dealing with the transition between phases. V.2: Leave Puff alone at the moment due to the complexity of coordination. BUG=b:153682192 BRANCH=none TEST=none Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029 Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40897 Reviewed-by: Sam McNally <sammc@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/hatch/Kconfig4
-rw-r--r--src/mainboard/google/hatch/Kconfig.name20
2 files changed, 22 insertions, 2 deletions
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 8404eaa3f70b..fc4424bd47e7 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -106,11 +106,13 @@ 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 "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
@@ -134,11 +136,13 @@ 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 "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
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 6465854104a4..798438fd0e6f 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -10,10 +10,18 @@ config BOARD_GOOGLE_DRATINI
select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
select BOARD_ROMSIZE_KB_16384
+config BOARD_GOOGLE_DUFFY_LEGACY
+ bool "-> Duffy Legacy (32MB)"
+ select BOARD_GOOGLE_BASEBOARD_HATCH
+ select BOARD_ROMSIZE_KB_32768
+ select ROMSTAGE_SPD_SMBUS
+ select SPD_READ_BY_WORD
+ select VBOOT_EC_EFS
+
config BOARD_GOOGLE_DUFFY
bool "-> Duffy"
select BOARD_GOOGLE_BASEBOARD_HATCH
- select BOARD_ROMSIZE_KB_32768
+ select BOARD_ROMSIZE_KB_16384
select ROMSTAGE_SPD_SMBUS
select SPD_READ_BY_WORD
select VBOOT_EC_EFS
@@ -29,10 +37,18 @@ config BOARD_GOOGLE_JINLON
select BOARD_ROMSIZE_KB_16384
select DRIVERS_GFX_GENERIC
+config BOARD_GOOGLE_KAISA_LEGACY
+ bool "-> Kaisa Legacy (32MB)"
+ select BOARD_GOOGLE_BASEBOARD_HATCH
+ select BOARD_ROMSIZE_KB_32768
+ select ROMSTAGE_SPD_SMBUS
+ select SPD_READ_BY_WORD
+ select VBOOT_EC_EFS
+
config BOARD_GOOGLE_KAISA
bool "-> Kaisa"
select BOARD_GOOGLE_BASEBOARD_HATCH
- select BOARD_ROMSIZE_KB_32768
+ select BOARD_ROMSIZE_KB_16384
select ROMSTAGE_SPD_SMBUS
select SPD_READ_BY_WORD
select VBOOT_EC_EFS