Change in coreboot[master]: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF

mb/google/hatch supports two different reference platforms - Hatch and
Puff. This change adds Kconfigs BOARD_GOOGLE_BASEBOARD_PUFF in
addition to BOARD_GOOGLE_BASEBOARD_HATCH to better organize the
Kconfig selections and reduce redundancy. In addition to this, a new
config BOARD_GOOGLE_HATCH_COMMON is added that selects all the common
configs for both baseboards.

TEST=Verified using abuild --timeless option that all hatch variants
generate the same coreboot.rom image with and without this change.

Change-Id: I46f8b2ed924c10228fa55e5168bf4fe6b41ec36c
Signed-off-by: Furquan Shaikh 
---
M src/mainboard/google/hatch/Kconfig
M src/mainboard/google/hatch/Kconfig.name
2 files changed, 36 insertions(+), 44 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/41660/1

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index fc4424b..d36c152 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -1,6 +1,22 @@

config BOARD_GOOGLE_BASEBOARD_HATCH
    def_bool n
+	select BOARD_GOOGLE_HATCH_COMMON
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select SYSTEM_TYPE_LAPTOP
+	select VBOOT_LID_SWITCH
+
+config BOARD_GOOGLE_BASEBOARD_PUFF
+	def_bool n
+	select BOARD_GOOGLE_HATCH_COMMON
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+
+config BOARD_GOOGLE_HATCH_COMMON
+	def_bool n
    select DRIVERS_GENERIC_GPIO_KEYS
    select DRIVERS_GENERIC_MAX98357A
    select DRIVERS_I2C_DA7219
@@ -22,15 +38,8 @@
    select MAINBOARD_HAS_TPM2
    select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
    select SOC_INTEL_COMETLAKE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE

-config BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select SYSTEM_TYPE_LAPTOP
-	def_bool n
-
-if BOARD_GOOGLE_BASEBOARD_HATCH
+if BOARD_GOOGLE_HATCH_COMMON

config CHROMEOS
    bool
@@ -157,11 +166,4 @@
    select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
    select VBOOT_EARLY_EC_SYNC

-endif # BOARD_GOOGLE_BASEBOARD_HATCH
-
-if BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
-
-config VBOOT
-	select VBOOT_LID_SWITCH
-
-endif # BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+endif # BOARD_GOOGLE_HATCH_COMMON
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 798438f..965555e 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -2,112 +2,102 @@

config BOARD_GOOGLE_AKEMI
    bool "-> Akemi"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_DRATINI
    bool "-> Dratini"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_DUFFY_LEGACY
    bool "-> Duffy Legacy (32MB)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_GOOGLE_BASEBOARD_PUFF
    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_GOOGLE_BASEBOARD_PUFF
    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
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768

config BOARD_GOOGLE_JINLON
    bool "-> Jinlon"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    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_GOOGLE_BASEBOARD_PUFF
    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_GOOGLE_BASEBOARD_PUFF
    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
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_KINDRED
    bool "->  Kindred"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	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_LAPTOP
+	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_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_PALKIA
    bool "->  Palkia"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	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_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

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

config BOARD_GOOGLE_HELIOS_DISKSWAP
    bool "->  Helios_Diskswap"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	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_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_SUSHI
    bool "-> Sushi"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41660/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/Kconfig.name:

https://review.coreboot.org/c/coreboot/+/41660/1/src/mainboard/google/hatch/... 
PS1, Line 91: BOARD_GOOGLE_PUFF
Ed - Do you know why Puff does not select VBOOT_EC_EFS?

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

Patch Set 1: Code-Review+2

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

Patch Set 1: Code-Review+1

(1 comment)

https://review.coreboot.org/c/coreboot/+/41660/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/Kconfig.name:

https://review.coreboot.org/c/coreboot/+/41660/1/src/mainboard/google/hatch/... 
PS1, Line 91: BOARD_GOOGLE_PUFF
> Ed - Do you know why Puff does not select VBOOT_EC_EFS?

That was introduced in https://review.coreboot.org/c/coreboot/+/39273 for EFS enablement when during EC development for some obscure reasons I have since forgotten about. I believe it was due to just EFS requirement. In any case, no need to touch it during a refactor patch.

[V Sowmya (Code Review)]

V Sowmya has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

Patch Set 2: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41660/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/Kconfig.name:

https://review.coreboot.org/c/coreboot/+/41660/1/src/mainboard/google/hatch/... 
PS1, Line 91: BOARD_GOOGLE_PUFF
> That was introduced in https://review.coreboot. […]

SGTM. We can push a follow-up patch to enable VBOOT_EC_EFS for all of Puff.

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41660 )

Change subject: mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF
......................................................................

mb/google/hatch: Split Kconfigs into BASEBOARD_HATCH and BASEBOARD_PUFF

mb/google/hatch supports two different reference platforms - Hatch and
Puff. This change adds Kconfigs BOARD_GOOGLE_BASEBOARD_PUFF in
addition to BOARD_GOOGLE_BASEBOARD_HATCH to better organize the
Kconfig selections and reduce redundancy. In addition to this, a new
config BOARD_GOOGLE_HATCH_COMMON is added that selects all the common
configs for both baseboards.

TEST=Verified using abuild --timeless option that all hatch variants
generate the same coreboot.rom image with and without this change.

Change-Id: I46f8b2ed924c10228fa55e5168bf4fe6b41ec36c
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41660
Reviewed-by: V Sowmya 
Reviewed-by: Angel Pons 
Reviewed-by: Edward O'Callaghan 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/hatch/Kconfig
M src/mainboard/google/hatch/Kconfig.name
2 files changed, 36 insertions(+), 44 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  V Sowmya: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Edward O'Callaghan: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index fc4424b..d36c152 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -1,6 +1,22 @@

config BOARD_GOOGLE_BASEBOARD_HATCH
    def_bool n
+	select BOARD_GOOGLE_HATCH_COMMON
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select SYSTEM_TYPE_LAPTOP
+	select VBOOT_LID_SWITCH
+
+config BOARD_GOOGLE_BASEBOARD_PUFF
+	def_bool n
+	select BOARD_GOOGLE_HATCH_COMMON
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+
+config BOARD_GOOGLE_HATCH_COMMON
+	def_bool n
    select DRIVERS_GENERIC_GPIO_KEYS
    select DRIVERS_GENERIC_MAX98357A
    select DRIVERS_I2C_DA7219
@@ -22,15 +38,8 @@
    select MAINBOARD_HAS_TPM2
    select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
    select SOC_INTEL_COMETLAKE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE

-config BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select SYSTEM_TYPE_LAPTOP
-	def_bool n
-
-if BOARD_GOOGLE_BASEBOARD_HATCH
+if BOARD_GOOGLE_HATCH_COMMON

config CHROMEOS
    bool
@@ -157,11 +166,4 @@
    select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
    select VBOOT_EARLY_EC_SYNC

-endif # BOARD_GOOGLE_BASEBOARD_HATCH
-
-if BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
-
-config VBOOT
-	select VBOOT_LID_SWITCH
-
-endif # BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+endif # BOARD_GOOGLE_HATCH_COMMON
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 195a4ea..7acc11d 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -2,114 +2,104 @@

config BOARD_GOOGLE_AKEMI
    bool "-> Akemi"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_DRATINI
    bool "-> Dratini"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_DUFFY_LEGACY
    bool "-> Duffy Legacy (32MB)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_GOOGLE_BASEBOARD_PUFF
    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_GOOGLE_BASEBOARD_PUFF
    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
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768

config BOARD_GOOGLE_JINLON
    bool "-> Jinlon"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    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_GOOGLE_BASEBOARD_PUFF
    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_GOOGLE_BASEBOARD_PUFF
    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
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_KINDRED
    bool "->  Kindred"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	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_LAPTOP
+	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_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_PALKIA
    bool "->  Palkia"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	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_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384
    select CHROMEOS_DSM_CALIB
    select DRIVERS_I2C_MAX98390

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

config BOARD_GOOGLE_HELIOS_DISKSWAP
    bool "->  Helios_Diskswap"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	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_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384

config BOARD_GOOGLE_SUSHI
    bool "-> Sushi"
-	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_16384