From 451abab2fdec8bb05a2b72195d4ffc1ea86759ce Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 8 May 2023 20:51:28 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/75085 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) --- src/mainboard/google/cherry/Kconfig | 33 +++++++++++++++------------------ 1 file 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" -- cgit v1.2.3