GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Edward O'Callaghan 2020-04-29 13:32:32 +10:00 committed by Edward O'Callaghan
parent 66b9c0efb5
commit 64e15aac1b
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/google/hatch/Kconfig
View File

@ -106,11 +106,13 @@ config MAINBOARD_PART_NUMBER
default "Akemi" if BOARD_GOOGLE_AKEMI default "Akemi" if BOARD_GOOGLE_AKEMI
default "Dratini" if BOARD_GOOGLE_DRATINI default "Dratini" if BOARD_GOOGLE_DRATINI
default "Duffy" if BOARD_GOOGLE_DUFFY default "Duffy" if BOARD_GOOGLE_DUFFY
default "Duffy" if BOARD_GOOGLE_DUFFY_LEGACY
default "Hatch" if BOARD_GOOGLE_HATCH default "Hatch" if BOARD_GOOGLE_HATCH
default "Helios" if BOARD_GOOGLE_HELIOS default "Helios" if BOARD_GOOGLE_HELIOS
default "Helios_Diskswap" if BOARD_GOOGLE_HELIOS_DISKSWAP default "Helios_Diskswap" if BOARD_GOOGLE_HELIOS_DISKSWAP
default "Jinlon" if BOARD_GOOGLE_JINLON default "Jinlon" if BOARD_GOOGLE_JINLON
default "Kaisa" if BOARD_GOOGLE_KAISA default "Kaisa" if BOARD_GOOGLE_KAISA
default "Kaisa" if BOARD_GOOGLE_KAISA_LEGACY
default "Kindred" if BOARD_GOOGLE_KINDRED default "Kindred" if BOARD_GOOGLE_KINDRED
default "Kohaku" if BOARD_GOOGLE_KOHAKU default "Kohaku" if BOARD_GOOGLE_KOHAKU
default "Mushu" if BOARD_GOOGLE_MUSHU default "Mushu" if BOARD_GOOGLE_MUSHU
@ -134,11 +136,13 @@ config VARIANT_DIR
default "akemi" if BOARD_GOOGLE_AKEMI default "akemi" if BOARD_GOOGLE_AKEMI
default "dratini" if BOARD_GOOGLE_DRATINI default "dratini" if BOARD_GOOGLE_DRATINI
default "duffy" if BOARD_GOOGLE_DUFFY default "duffy" if BOARD_GOOGLE_DUFFY
default "duffy" if BOARD_GOOGLE_DUFFY_LEGACY
default "hatch" if BOARD_GOOGLE_HATCH default "hatch" if BOARD_GOOGLE_HATCH
default "helios" if BOARD_GOOGLE_HELIOS default "helios" if BOARD_GOOGLE_HELIOS
default "helios" if BOARD_GOOGLE_HELIOS_DISKSWAP default "helios" if BOARD_GOOGLE_HELIOS_DISKSWAP
default "jinlon" if BOARD_GOOGLE_JINLON default "jinlon" if BOARD_GOOGLE_JINLON
default "kaisa" if BOARD_GOOGLE_KAISA default "kaisa" if BOARD_GOOGLE_KAISA
default "kaisa" if BOARD_GOOGLE_KAISA_LEGACY
default "kindred" if BOARD_GOOGLE_KINDRED default "kindred" if BOARD_GOOGLE_KINDRED
default "kohaku" if BOARD_GOOGLE_KOHAKU default "kohaku" if BOARD_GOOGLE_KOHAKU
default "mushu" if BOARD_GOOGLE_MUSHU default "mushu" if BOARD_GOOGLE_MUSHU

20
src/mainboard/google/hatch/Kconfig.name
View File

@ -10,10 +10,18 @@ config BOARD_GOOGLE_DRATINI
select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
select BOARD_ROMSIZE_KB_16384 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 config BOARD_GOOGLE_DUFFY
bool "-> Duffy" bool "-> Duffy"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_16384
select ROMSTAGE_SPD_SMBUS select ROMSTAGE_SPD_SMBUS
select SPD_READ_BY_WORD select SPD_READ_BY_WORD
select VBOOT_EC_EFS select VBOOT_EC_EFS
@ -29,10 +37,18 @@ config BOARD_GOOGLE_JINLON
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select DRIVERS_GFX_GENERIC 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 config BOARD_GOOGLE_KAISA
bool "-> Kaisa" bool "-> Kaisa"
select BOARD_GOOGLE_BASEBOARD_HATCH select BOARD_GOOGLE_BASEBOARD_HATCH
select BOARD_ROMSIZE_KB_32768 select BOARD_ROMSIZE_KB_16384
select ROMSTAGE_SPD_SMBUS select ROMSTAGE_SPD_SMBUS
select SPD_READ_BY_WORD select SPD_READ_BY_WORD
select VBOOT_EC_EFS select VBOOT_EC_EFS