[coreboot-gerrit] Change in coreboot[master]: mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB
......................................................................

mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB

Originally variants make use of a 32MBit chip whereas now they
use a 16MBit spi flash. Allow for the coordination of dealing
with the transition between phases.

BUG=b:153682192
BRANCH=none
TEST=none

Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029
Signed-off-by: Edward O'Callaghan 
---
M src/mainboard/google/hatch/Kconfig.name
1 file changed, 26 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/40897/1

diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 6465854..b7adc8b 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -10,7 +10,7 @@
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
    select BOARD_ROMSIZE_KB_16384

-config BOARD_GOOGLE_DUFFY
+config BOARD_GOOGLE_DUFFY_LEGACY
    bool "-> Duffy"
    select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768
@@ -18,6 +18,14 @@
    select SPD_READ_BY_WORD
    select VBOOT_EC_EFS

+config BOARD_GOOGLE_DUFFY
+	bool "-> Duffy"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_16384
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+	select VBOOT_EC_EFS
+
 config BOARD_GOOGLE_HATCH
    bool "->  Hatch"
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
@@ -29,7 +37,7 @@
    select BOARD_ROMSIZE_KB_16384
    select DRIVERS_GFX_GENERIC

-config BOARD_GOOGLE_KAISA
+config BOARD_GOOGLE_KAISA_LEGACY
    bool "-> Kaisa"
    select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768
@@ -37,6 +45,14 @@
    select SPD_READ_BY_WORD
    select VBOOT_EC_EFS

+config BOARD_GOOGLE_KAISA
+	bool "-> Kaisa"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_16384
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+	select VBOOT_EC_EFS
+
 config BOARD_GOOGLE_KOHAKU
    bool "->  Kohaku"
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
@@ -72,13 +88,20 @@
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
    select BOARD_ROMSIZE_KB_16384

-config BOARD_GOOGLE_PUFF
+config BOARD_GOOGLE_PUFF_LEGACY
    bool "-> Puff"
    select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768
    select ROMSTAGE_SPD_SMBUS
    select SPD_READ_BY_WORD

+config BOARD_GOOGLE_PUFF
+	bool "-> Puff"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_16384
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+
 config BOARD_GOOGLE_HELIOS_DISKSWAP
    bool "->  Helios_Diskswap"
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP