summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-05-08 20:51:28 +0200
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-09-23 21:07:55 +0000
commit451abab2fdec8bb05a2b72195d4ffc1ea86759ce (patch)
tree589cf33a802a320b3c826eb375b5d92bc708db32
parent222ebeef01419a0aec038e72ad1c1ede547503b7 (diff)
downloadcoreboot-451abab2fdec8bb05a2b72195d4ffc1ea86759ce.tar.gz
coreboot-451abab2fdec8bb05a2b72195d4ffc1ea86759ce.tar.bz2
coreboot-451abab2fdec8bb05a2b72195d4ffc1ea86759ce.zip
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>
-rw-r--r--src/mainboard/google/cherry/Kconfig33
1 files changed, 15 insertions, 18 deletions
diff --git a/src/mainboard/google/cherry/Kconfig b/src/mainboard/google/cherry/Kconfig
index 3da672507689..a99d7a5f2861 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 @@ config BOARD_SPECIFIC_OPTIONS
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"