From 1a438f33ffe5482c7a995cb1b25cc70db9b1e7fa Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 22 May 2020 00:06:33 -0700 Subject: [PATCH] mb/google/hatch: Select BOARD_ROMSIZE_KB_16384 by default All hatch and puff variants use 16MiB SPI flash except the legacy ones which used 32MiB flash. Kconfig.name is updated to select BOARD_ROMSIZE_KB_32768 only for the legacy variants and BOARD_GOOGLE_HATCH_COMMON selects BOARD_ROMSIZE_KB_16384 by default if BOARD_ROMSIZE_KB_32768 is not selected. TEST=Verified using abuild --timeless that all hatch variants generate the same coreboot.rom image with and without this change. Change-Id: I708506182966936ea38562db8b0325470e34c908 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/41662 Reviewed-by: Edward O'Callaghan Reviewed-by: V Sowmya Tested-by: build bot (Jenkins) --- src/mainboard/google/hatch/Kconfig | 1 + src/mainboard/google/hatch/Kconfig.name | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 853f72b6f9..7e3b9e3948 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -15,6 +15,7 @@ config BOARD_GOOGLE_BASEBOARD_PUFF config BOARD_GOOGLE_HATCH_COMMON 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 diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name index 1194f82a3f..c4490c601d 100644 --- a/src/mainboard/google/hatch/Kconfig.name +++ b/src/mainboard/google/hatch/Kconfig.name @@ -3,12 +3,10 @@ comment "Hatch" config BOARD_GOOGLE_AKEMI bool "-> Akemi" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_DRATINI bool "-> Dratini" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_DUFFY_LEGACY bool "-> Duffy Legacy (32MB)" @@ -18,7 +16,6 @@ config BOARD_GOOGLE_DUFFY_LEGACY config BOARD_GOOGLE_DUFFY bool "-> Duffy" select BOARD_GOOGLE_BASEBOARD_PUFF - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_HATCH bool "-> Hatch" @@ -28,7 +25,6 @@ config BOARD_GOOGLE_HATCH config BOARD_GOOGLE_JINLON bool "-> Jinlon" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 select DRIVERS_GFX_GENERIC config BOARD_GOOGLE_KAISA_LEGACY @@ -39,42 +35,35 @@ config BOARD_GOOGLE_KAISA_LEGACY config BOARD_GOOGLE_KAISA bool "-> Kaisa" select BOARD_GOOGLE_BASEBOARD_PUFF - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_KOHAKU bool "-> Kohaku" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_KINDRED bool "-> Kindred" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 select SOC_INTEL_COMMON_MMC_OVERRIDE config BOARD_GOOGLE_HELIOS bool "-> Helios" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 select CHROMEOS_DSM_CALIB select DRIVERS_I2C_RT1011 config BOARD_GOOGLE_MUSHU bool "-> Mushu" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_PALKIA bool "-> Palkia" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 select CHROMEOS_DSM_CALIB select DRIVERS_I2C_RT1011 config BOARD_GOOGLE_NIGHTFURY bool "-> Nightfury" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 select CHROMEOS_DSM_CALIB select DRIVERS_I2C_MAX98390 @@ -86,16 +75,13 @@ config BOARD_GOOGLE_PUFF config BOARD_GOOGLE_HELIOS_DISKSWAP bool "-> Helios_Diskswap" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 select CHROMEOS_DSM_CALIB select DRIVERS_I2C_RT1011 config BOARD_GOOGLE_STRYKE bool "-> Stryke" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384 config BOARD_GOOGLE_SUSHI bool "-> Sushi" select BOARD_GOOGLE_BASEBOARD_HATCH - select BOARD_ROMSIZE_KB_16384