summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-06-17 14:30:10 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-06-21 08:50:31 +0000
commit4c7979a24179f93306ce177b80c6b38cccfadc2c (patch)
treea15955de615def35d6ca9d3c1b64572c69b4898a /src/soc/intel
parente07eb5f173b26f44d7779c8030d59f4d295e28fa (diff)
soc/intel/skylake: Clean up Kconfig
This does the following: - select MAINBOARD_USES_FSP2_0 on Kabylake (does not support FSP1.1) - Remove stale Kconfig option on intel/saddlebrook - select SOC_INTEL_KABYLAKE on intel/kblrvp Change-Id: I64f48eeb00150aea039d533b0ac471fdd8483b90 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33561 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/skylake/Kconfig10
-rw-r--r--src/soc/intel/skylake/Makefile.inc2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 626b5f80f0..fb455d2392 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -1,16 +1,20 @@
+config SOC_INTEL_COMMON_SKYLAKE_BASE
+ bool
+
config SOC_INTEL_SKYLAKE
bool
+ select SOC_INTEL_COMMON_SKYLAKE_BASE
help
Intel Skylake support
config SOC_INTEL_KABYLAKE
bool
- default n
- select SOC_INTEL_SKYLAKE
+ select SOC_INTEL_COMMON_SKYLAKE_BASE
+ select MAINBOARD_USES_FSP2_0
help
Intel Kabylake support
-if SOC_INTEL_SKYLAKE
+if SOC_INTEL_COMMON_SKYLAKE_BASE
config CPU_SPECIFIC_OPTIONS
def_bool y
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index 05e4c968e8..985acdf135 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -1,4 +1,4 @@
-ifeq ($(CONFIG_SOC_INTEL_SKYLAKE),y)
+ifeq ($(CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE),y)
subdirs-y += nhlt
subdirs-y += romstage