From 375b65eb1d4de9a3293e22910e08d7911f2767c6 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 21 Sep 2023 23:27:07 +0200 Subject: [PATCH] mb/google/rex: 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: Id69ea99b452e4214fcc81335a5c961b4da3ce48b Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/75021 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Martin L Roth --- src/mainboard/google/rex/Kconfig | 35 +++++++++++++++++++++++++++ src/mainboard/google/rex/Kconfig.name | 15 ------------ 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index 3d246681f8..e2c730eaf7 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -97,6 +97,41 @@ config BOARD_GOOGLE_MODEL_OVIS def_bool n select BOARD_GOOGLE_BASEBOARD_OVIS +config BOARD_GOOGLE_REX0 + select BOARD_GOOGLE_MODEL_REX + +config BOARD_GOOGLE_SCREEBO + select BOARD_GOOGLE_MODEL_SCREEBO + +config BOARD_GOOGLE_SCREEBO4ES + select BOARD_GOOGLE_MODEL_SCREEBO + select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON + +config BOARD_GOOGLE_KARIS + select BOARD_GOOGLE_MODEL_KARIS + +config BOARD_GOOGLE_KARIS4ES + select BOARD_GOOGLE_MODEL_KARIS + select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON + +config BOARD_GOOGLE_REX_EC_ISH + select BOARD_GOOGLE_MODEL_REX_EC_ISH + +config BOARD_GOOGLE_OVIS + select BOARD_GOOGLE_MODEL_OVIS + +config BOARD_GOOGLE_OVIS4ES + select BOARD_GOOGLE_MODEL_OVIS + select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON + +config BOARD_GOOGLE_REX4ES + select BOARD_GOOGLE_MODEL_REX + select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON + +config BOARD_GOOGLE_REX4ES_EC_ISH + select BOARD_GOOGLE_MODEL_REX_EC_ISH + select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON + if BOARD_GOOGLE_REX_COMMON config BASEBOARD_DIR diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name index bc4a52bc2c..3dfd548095 100644 --- a/src/mainboard/google/rex/Kconfig.name +++ b/src/mainboard/google/rex/Kconfig.name @@ -2,45 +2,30 @@ comment "Rex" config BOARD_GOOGLE_REX0 bool "-> Rex 0" - select BOARD_GOOGLE_MODEL_REX config BOARD_GOOGLE_SCREEBO bool "-> Screebo" - select BOARD_GOOGLE_MODEL_SCREEBO config BOARD_GOOGLE_SCREEBO4ES bool "-> Screebo4ES" - select BOARD_GOOGLE_MODEL_SCREEBO - select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON config BOARD_GOOGLE_KARIS bool "-> Karis" - select BOARD_GOOGLE_MODEL_KARIS config BOARD_GOOGLE_KARIS4ES bool "-> Karis4ES" - select BOARD_GOOGLE_MODEL_KARIS - select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON config BOARD_GOOGLE_REX_EC_ISH bool "-> Rex EC ISH" - select BOARD_GOOGLE_MODEL_REX_EC_ISH config BOARD_GOOGLE_OVIS bool "-> Ovis" - select BOARD_GOOGLE_MODEL_OVIS config BOARD_GOOGLE_OVIS4ES bool "-> Ovis4ES" - select BOARD_GOOGLE_MODEL_OVIS - select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON config BOARD_GOOGLE_REX4ES bool "-> Rex4ES" - select BOARD_GOOGLE_MODEL_REX - select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON config BOARD_GOOGLE_REX4ES_EC_ISH bool "-> Rex4ES EC ISH" - select BOARD_GOOGLE_MODEL_REX_EC_ISH - select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON