summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/hatch/Kconfig34
-rw-r--r--src/mainboard/google/hatch/Kconfig.name46
2 files changed, 36 insertions, 44 deletions
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index fc4424bd47..d36c152f04 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 @@ config BOARD_GOOGLE_BASEBOARD_HATCH
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 @@ config VBOOT
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 195a4ea544..7acc11d484 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -2,114 +2,104 @@ comment "Hatch"
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