4 files changed, 61 insertions, 141 deletions
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 837b06d403..2d7e12c972 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -1,25 +1,12 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-config BOARD_GOOGLE_GRU_COMMON  # Umbrella option to be selected by variant boards.
-	def_bool n
-
-config BOARD_GOOGLE_KEVIN
-	select BOARD_GOOGLE_GRU_COMMON
-
-config BOARD_GOOGLE_GRU
-	select BOARD_GOOGLE_GRU_COMMON
-
-config BOARD_GOOGLE_BOB
-	select BOARD_GOOGLE_GRU_COMMON
-
-config BOARD_GOOGLE_SCARLET
-	select BOARD_GOOGLE_GRU_COMMON
-
-config BOARD_GOOGLE_NEFARIO
-	select BOARD_GOOGLE_GRU_COMMON
-
-config BOARD_GOOGLE_RAINIER
-	select BOARD_GOOGLE_GRU_COMMON
+config BOARD_GOOGLE_GRU_COMMON
+	def_bool BOARD_GOOGLE_BOB || \
+		 BOARD_GOOGLE_GRU || \
+		 BOARD_GOOGLE_KEVIN || \
+		 BOARD_GOOGLE_NEFARIO || \
+		 BOARD_GOOGLE_RAINIER || \
+		 BOARD_GOOGLE_SCARLET
 
 if BOARD_GOOGLE_GRU_COMMON
 
@@ -27,23 +14,21 @@ if BOARD_GOOGLE_GRU_COMMON
 # convenience. Explicitly override it when building for earlier Kevins.
 config GRU_HAS_TPM2
 	bool "Build for a board revision with a SPI TPM 2.0"
-	default n if BOARD_GOOGLE_KEVIN
-	default y
+	default !BOARD_GOOGLE_KEVIN
 
 config GRU_HAS_CENTERLOG_PWM
-	bool
-	default y if BOARD_GOOGLE_GRU || BOARD_GOOGLE_KEVIN || BOARD_GOOGLE_BOB
-	default n
+	def_bool BOARD_GOOGLE_GRU || \
+		 BOARD_GOOGLE_KEVIN || \
+		 BOARD_GOOGLE_BOB
 
 config GRU_HAS_WLAN_RESET
-	bool
-	default y if BOARD_GOOGLE_GRU || BOARD_GOOGLE_KEVIN || BOARD_GOOGLE_BOB
-	default n
+	def_bool BOARD_GOOGLE_GRU || \
+		 BOARD_GOOGLE_KEVIN || \
+		 BOARD_GOOGLE_BOB
 
 config GRU_BASEBOARD_SCARLET
-	bool
-	default y if BOARD_GOOGLE_SCARLET || BOARD_GOOGLE_RAINIER
-	default n
+	def_bool BOARD_GOOGLE_SCARLET || \
+		 BOARD_GOOGLE_RAINIER
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig
index 45f296cb28..8758fb9c4f 100644
--- a/src/mainboard/google/herobrine/Kconfig
+++ b/src/mainboard/google/herobrine/Kconfig
@@ -1,39 +1,21 @@
-config BOARD_GOOGLE_HEROBRINE_COMMON  # Umbrella option to be selected by variants
-	def_bool n
-
-config BOARD_GOOGLE_HEROBRINE
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_HEROBRINE_REV0
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_SENOR
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_PIGLIN
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_HOGLIN
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_VILLAGER
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_EVOKER
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_ZOGLIN
-	select BOARD_GOOGLE_HEROBRINE_COMMON
-
-config BOARD_GOOGLE_ZOMBIE
-	select BOARD_GOOGLE_HEROBRINE_COMMON
+## SPDX-License-Identifier: GPL-2.0-only
+
+config BOARD_GOOGLE_HEROBRINE_COMMON
+	def_bool BOARD_GOOGLE_EVOKER || \
+		 BOARD_GOOGLE_HEROBRINE || \
+		 BOARD_GOOGLE_HEROBRINE_REV0 || \
+		 BOARD_GOOGLE_HOGLIN || \
+		 BOARD_GOOGLE_PIGLIN || \
+		 BOARD_GOOGLE_SENOR || \
+		 BOARD_GOOGLE_VILLAGER || \
+		 BOARD_GOOGLE_ZOGLIN || \
+		 BOARD_GOOGLE_ZOMBIE
 
 if BOARD_GOOGLE_HEROBRINE_COMMON
 
 config HEROBRINE_HAS_FINGERPRINT
-	bool
-	default y if BOARD_GOOGLE_HEROBRINE || BOARD_GOOGLE_HEROBRINE_REV0
-	default n
+	def_bool BOARD_GOOGLE_HEROBRINE || \
+		 BOARD_GOOGLE_HEROBRINE_REV0
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index f7e1afefda..2a933bb6a5 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -1,45 +1,19 @@
-
-config BOARD_GOOGLE_TROGDOR_COMMON  # Umbrella option to be selected by variants
-	def_bool n
-
-config BOARD_GOOGLE_BUBS
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_COACHZ
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_GELARSHIE
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_HOMESTAR
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_KINGOFTOWN
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_LAZOR
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_MARZIPAN
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_MRBLAND
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_PAZQUEL
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_POMPOM
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_QUACKINGSTICK
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_WORMDINGLER
-	select BOARD_GOOGLE_TROGDOR_COMMON
-
-config BOARD_GOOGLE_TROGDOR
-	select BOARD_GOOGLE_TROGDOR_COMMON
+## SPDX-License-Identifier: GPL-2.0-only
+
+config BOARD_GOOGLE_TROGDOR_COMMON
+	def_bool BOARD_GOOGLE_BUBS || \
+		 BOARD_GOOGLE_COACHZ || \
+		 BOARD_GOOGLE_GELARSHIE || \
+		 BOARD_GOOGLE_HOMESTAR || \
+		 BOARD_GOOGLE_KINGOFTOWN || \
+		 BOARD_GOOGLE_LAZOR || \
+		 BOARD_GOOGLE_MARZIPAN || \
+		 BOARD_GOOGLE_MRBLAND || \
+		 BOARD_GOOGLE_PAZQUEL || \
+		 BOARD_GOOGLE_POMPOM || \
+		 BOARD_GOOGLE_QUACKINGSTICK || \
+		 BOARD_GOOGLE_TROGDOR || \
+		 BOARD_GOOGLE_WORMDINGLER
 
 if BOARD_GOOGLE_TROGDOR_COMMON
 
@@ -47,24 +21,20 @@ config TROGDOR_REV0
 	def_bool n
 
 config TROGDOR_HAS_BRIDGE_BACKLIGHT
-	bool
-	default y if BOARD_GOOGLE_HOMESTAR
-	default n
+	def_bool BOARD_GOOGLE_HOMESTAR
 
 config TROGDOR_HAS_MIPI_PANEL
-	bool
-	default y if BOARD_GOOGLE_MRBLAND || BOARD_GOOGLE_QUACKINGSTICK || BOARD_GOOGLE_WORMDINGLER
+	def_bool BOARD_GOOGLE_MRBLAND || \
+		 BOARD_GOOGLE_QUACKINGSTICK || \
+		 BOARD_GOOGLE_WORMDINGLER
 	select MIPI_PANEL_AUO_B101UAN08_3 if BOARD_GOOGLE_MRBLAND || BOARD_GOOGLE_QUACKINGSTICK
 	select MIPI_PANEL_BOE_TV101WUM_N53 if BOARD_GOOGLE_MRBLAND
 	select MIPI_PANEL_INX_HJ110IZ_01A_B2 if BOARD_GOOGLE_WORMDINGLER
 	select MIPI_PANEL_BOE_TV110C9M_LL0 if BOARD_GOOGLE_WORMDINGLER
-	default n
 
 config TROGDOR_HAS_FINGERPRINT
-	bool
-	default y if BOARD_GOOGLE_COACHZ
-	default y if BOARD_GOOGLE_MARZIPAN
-	default n
+	def_bool BOARD_GOOGLE_COACHZ || \
+		 BOARD_GOOGLE_MARZIPAN
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 0e543e16e0..08af44213b 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -1,27 +1,11 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
 config BOARD_GOOGLE_VEYRON
-	def_bool n
-
-config BOARD_GOOGLE_VEYRON_JAQ
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
-
-config BOARD_GOOGLE_VEYRON_JERRY
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
-
-config BOARD_GOOGLE_VEYRON_MIGHTY
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
-
-config BOARD_GOOGLE_VEYRON_MINNIE
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
-
-config BOARD_GOOGLE_VEYRON_SPEEDY
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
+	def_bool BOARD_GOOGLE_VEYRON_JAQ || \
+		 BOARD_GOOGLE_VEYRON_JERRY || \
+		 BOARD_GOOGLE_VEYRON_MIGHTY || \
+		 BOARD_GOOGLE_VEYRON_MINNIE || \
+		 BOARD_GOOGLE_VEYRON_SPEEDY
 
 if BOARD_GOOGLE_VEYRON
 
@@ -29,11 +13,9 @@ if BOARD_GOOGLE_VEYRON
 # resistors. These get overpowered by the SoC's internal pull-downs, so we
 # cannot read those pins as tri-state. They're restricted to binary RAM codes.
 config VEYRON_FORCE_BINARY_RAM_CODE
-	bool
-	default y if BOARD_GOOGLE_VEYRON_JAQ
-	default y if BOARD_GOOGLE_VEYRON_JERRY
-	default y if BOARD_GOOGLE_VEYRON_MIGHTY
-	default n
+	def_bool BOARD_GOOGLE_VEYRON_JAQ || \
+		 BOARD_GOOGLE_VEYRON_JERRY || \
+		 BOARD_GOOGLE_VEYRON_MIGHTY
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
@@ -48,6 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH_WINBOND
 	select I2C_TPM
 	select MAINBOARD_HAS_TPM1
+	select SYSTEM_TYPE_LAPTOP
 
 config VBOOT
 	select VBOOT_VBNV_FLASH