Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33559
Change subject: soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE ......................................................................
soc/intel/cannonlake/Kconfig: Don't have all variants select SOC_INTEL_CANNONLAKE
Change-Id: Ica11c68377e3d0dc8a8f48198e01a74d7bebe642 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/cannonlake/Kconfig M src/soc/intel/cannonlake/Makefile.inc 2 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/33559/1
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index dac3522..277635a 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -1,12 +1,6 @@ -config SOC_INTEL_CANNONLAKE - bool - help - Intel Cannonlake support - config SOC_INTEL_COMMON_CANNONLAKE_BASE bool default n - select SOC_INTEL_CANNONLAKE help Single Kconfig option to select common base Cannonlake support. This Kconfig will help to select majority of CNL SoC features. @@ -16,34 +10,37 @@ required SoC support FSP headers. Any future Intel SoC would like to make use of CNL support might just select this Kconfig.
+ +config SOC_INTEL_CANNONLAKE + bool + select SOC_INTEL_COMMON_CANNONLAKE_BASE + help + Intel Cannonlake support + config SOC_INTEL_COFFEELAKE bool - default n select SOC_INTEL_COMMON_CANNONLAKE_BASE help Intel Coffeelake support
config SOC_INTEL_WHISKEYLAKE bool - default n select SOC_INTEL_COMMON_CANNONLAKE_BASE help Intel Whiskeylake support
config SOC_INTEL_COMETLAKE bool - default n select SOC_INTEL_COMMON_CANNONLAKE_BASE help Intel Cometlake support
config SOC_INTEL_CANNONLAKE_PCH_H bool - default n help Choose this option if you have a PCH-H chipset.
-if SOC_INTEL_CANNONLAKE +if SOC_INTEL_COMMON_CANNONLAKE_BASE
config CPU_SPECIFIC_OPTIONS def_bool y diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc index 1328944..77b48f8 100644 --- a/src/soc/intel/cannonlake/Makefile.inc +++ b/src/soc/intel/cannonlake/Makefile.inc @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE),y) +ifeq ($(CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE),y)
subdirs-y += romstage subdirs-y += ../../../cpu/intel/microcode