mb/google/cherry: Move common selects to BOARD_GOOGLE_CHERRY_COMMON
BOARD_SPECIFIC_OPTIONS is duplicate to BOARD_GOOGLE_CHERRY_COMMON.
Thus, move all selects to the latter option.
Change-Id: I080201761d0a06d3b8a5a29de6085dde58960a60
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75085
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/cherry/Kconfig b/src/mainboard/google/cherry/Kconfig
index 3da6725..a99d7a5 100644
--- a/src/mainboard/google/cherry/Kconfig
+++ b/src/mainboard/google/cherry/Kconfig
@@ -3,24 +3,6 @@
# Umbrella option to be selected by variant boards.
config BOARD_GOOGLE_CHERRY_COMMON
def_bool n
-
-config BOARD_GOOGLE_CHERRY
- select BOARD_GOOGLE_CHERRY_COMMON
-
-config BOARD_GOOGLE_DOJO
- select BOARD_GOOGLE_CHERRY_COMMON
-
-config BOARD_GOOGLE_TOMATO
- select BOARD_GOOGLE_CHERRY_COMMON
-
-if BOARD_GOOGLE_CHERRY_COMMON
-
-config VBOOT
- select EC_GOOGLE_CHROMEEC_SWITCHES
- select VBOOT_VBNV_FLASH
-
-config BOARD_SPECIFIC_OPTIONS
- def_bool y
select RTC
select SOC_MEDIATEK_MT8195
select BOARD_ROMSIZE_KB_8192
@@ -41,6 +23,21 @@
select COMMONLIB_STORAGE
select COMMONLIB_STORAGE_MMC
+config BOARD_GOOGLE_CHERRY
+ select BOARD_GOOGLE_CHERRY_COMMON
+
+config BOARD_GOOGLE_DOJO
+ select BOARD_GOOGLE_CHERRY_COMMON
+
+config BOARD_GOOGLE_TOMATO
+ select BOARD_GOOGLE_CHERRY_COMMON
+
+if BOARD_GOOGLE_CHERRY_COMMON
+
+config VBOOT
+ select EC_GOOGLE_CHROMEEC_SWITCHES
+ select VBOOT_VBNV_FLASH
+
config MAINBOARD_DIR
default "google/cherry"