From 9fe66a755d1ac7b0a6613c2b8c82f939ebb445f8 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 23 Sep 2023 21:40:19 +0200 Subject: [PATCH] mb/google/corsola: Move common selects to BOARD_GOOGLE_CORSOLA_COMMON BOARD_SPECIFIC_OPTIONS is duplicate to BOARD_GOOGLE_CORSOLA_COMMON. Thus, move all selects to the latter option. Change-Id: I498c6671b2dfc72820fc522744af7ce3b0a62930 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/75086 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Yidi Lin --- src/mainboard/google/corsola/Kconfig | 45 +++++++++++++--------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig index cd2ae8f062..69b2f1fbbb 100644 --- a/src/mainboard/google/corsola/Kconfig +++ b/src/mainboard/google/corsola/Kconfig @@ -3,6 +3,27 @@ # Umbrella option to be selected by variant boards. config BOARD_GOOGLE_CORSOLA_COMMON def_bool n + select SOC_MEDIATEK_MT8186 + select BOARD_ROMSIZE_KB_8192 + select MAINBOARD_HAS_CHROMEOS + select CHROMEOS_USE_EC_WATCHDOG_FLAG if CHROMEOS + select COMMON_CBFS_SPI_WRAPPER + select SPI_FLASH + select SPI_FLASH_INCLUDE_ALL_DRIVERS + select COMMONLIB_STORAGE + select COMMONLIB_STORAGE_MMC + select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_BOARDID + select EC_GOOGLE_CHROMEEC_SKUID + select EC_GOOGLE_CHROMEEC_SPI + select SPI_TPM if VBOOT + select TPM_GOOGLE_TI50 if VBOOT + select MAINBOARD_HAS_TPM2 if VBOOT + select MAINBOARD_HAS_NATIVE_VGA_INIT + select HAVE_LINEAR_FRAMEBUFFER + select DRIVER_ANALOGIX_ANX7625 + select DRIVER_PARADE_PS8640 + select RTC config BOARD_GOOGLE_KINGLER_COMMON def_bool n @@ -48,30 +69,6 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_VBNV_FLASH -config BOARD_SPECIFIC_OPTIONS - def_bool y - select SOC_MEDIATEK_MT8186 - select BOARD_ROMSIZE_KB_8192 - select MAINBOARD_HAS_CHROMEOS - select CHROMEOS_USE_EC_WATCHDOG_FLAG if CHROMEOS - select COMMON_CBFS_SPI_WRAPPER - select SPI_FLASH - select SPI_FLASH_INCLUDE_ALL_DRIVERS - select COMMONLIB_STORAGE - select COMMONLIB_STORAGE_MMC - select EC_GOOGLE_CHROMEEC - select EC_GOOGLE_CHROMEEC_BOARDID - select EC_GOOGLE_CHROMEEC_SKUID - select EC_GOOGLE_CHROMEEC_SPI - select SPI_TPM if VBOOT - select TPM_GOOGLE_TI50 if VBOOT - select MAINBOARD_HAS_TPM2 if VBOOT - select MAINBOARD_HAS_NATIVE_VGA_INIT - select HAVE_LINEAR_FRAMEBUFFER - select DRIVER_ANALOGIX_ANX7625 - select DRIVER_PARADE_PS8640 - select RTC - config MAINBOARD_DIR string default "google/corsola"