From a2dffba45f2c957e9cf069af59d99751a9e96b0e Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 12 Nov 2023 07:03:23 +0000
Subject: [PATCH] mb/google/herobrine: Move selects from Kconfig.name to
 Kconfig

Selects should be done in the Kconfig file instead of Kconfig.name and
not mixed over both files.

Change-Id: I25b7adccf60abe515d129f8d00383165eccf6431
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79028
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/herobrine/Kconfig      | 27 +++++++++++++++++++++
 src/mainboard/google/herobrine/Kconfig.name |  9 -------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig
index a95ac068b2..45f296cb28 100644
--- a/src/mainboard/google/herobrine/Kconfig
+++ b/src/mainboard/google/herobrine/Kconfig
@@ -1,6 +1,33 @@
 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
+
 if BOARD_GOOGLE_HEROBRINE_COMMON
 
 config HEROBRINE_HAS_FINGERPRINT
diff --git a/src/mainboard/google/herobrine/Kconfig.name b/src/mainboard/google/herobrine/Kconfig.name
index e779c91bbc..4c4937338b 100644
--- a/src/mainboard/google/herobrine/Kconfig.name
+++ b/src/mainboard/google/herobrine/Kconfig.name
@@ -2,36 +2,27 @@ comment "Herobrine"
 
 config BOARD_GOOGLE_HEROBRINE
 	bool "->  Herobrine"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_HEROBRINE_REV0
 	bool "->  Herobrine_Rev0"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_SENOR
 	bool "->  Senor"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_PIGLIN
 	bool "->  Piglin"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_HOGLIN
 	bool "-> Hoglin"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_VILLAGER
 	bool "-> Villager"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_EVOKER
 	bool "-> Evoker"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_ZOGLIN
 	bool "-> Zoglin"
-	select BOARD_GOOGLE_HEROBRINE_COMMON
 
 config BOARD_GOOGLE_ZOMBIE
 	bool "->  Zombie"
-	select BOARD_GOOGLE_HEROBRINE_COMMON