aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake
diff options
context:
space:
mode:
authorElyes Haouas <ehaouas@noos.fr>2023-08-21 20:39:25 +0200
committerMartin L Roth <gaumless@gmail.com>2023-08-21 23:45:43 +0000
commit757509113b6b944167cf1f13f9569236cd7e5b18 (patch)
treea704133034ae50f622c9381454513145ef86d02b /src/soc/intel/apollolake
parenta1957314c2cb78a229ca87bd2523d24001a644a9 (diff)
soc: Remove SOC_SPECIFIC_OPTIONS
Move specific options under the boolean and remove dummy SOC_SPECIFIC_OPTIONS. Change-Id: I6ae52ceb61489e5a050a60d1fbbf4250960407eb Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/76487 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'src/soc/intel/apollolake')
-rw-r--r--src/soc/intel/apollolake/Kconfig39
1 files changed, 18 insertions, 21 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index dbcdf8014e..bce935d800 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -1,27 +1,6 @@
config SOC_INTEL_APOLLOLAKE
bool
select INTEL_CAR_CQOS
- help
- Intel Apollolake support
-
-config SOC_INTEL_GEMINILAKE
- bool
- default n
- select SOC_INTEL_APOLLOLAKE
- select SOC_INTEL_COMMON_BLOCK_CNVI
- select SOC_INTEL_COMMON_BLOCK_CPU_MPINIT
- select SOC_INTEL_COMMON_BLOCK_SGX
- select SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2
- select IDT_IN_EVERY_STAGE
- select PAGING_IN_CACHE_AS_RAM
- select INTEL_CAR_NEM
- help
- Intel Geminilake support
-
-if SOC_INTEL_APOLLOLAKE
-
-config CPU_SPECIFIC_OPTIONS
- def_bool y
select ACPI_INTEL_HARDWARE_SLEEP_VALUES
select ACPI_NO_PCAT_8259
select ARCH_X86
@@ -102,6 +81,24 @@ config CPU_SPECIFIC_OPTIONS
# This SoC does not map SPI flash like many previous SoC. Therefore we
# provide a custom media driver that facilitates mapping
select X86_CUSTOM_BOOTMEDIA
+ help
+ Intel Apollolake support
+
+config SOC_INTEL_GEMINILAKE
+ bool
+ default n
+ select SOC_INTEL_APOLLOLAKE
+ select SOC_INTEL_COMMON_BLOCK_CNVI
+ select SOC_INTEL_COMMON_BLOCK_CPU_MPINIT
+ select SOC_INTEL_COMMON_BLOCK_SGX
+ select SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2
+ select IDT_IN_EVERY_STAGE
+ select PAGING_IN_CACHE_AS_RAM
+ select INTEL_CAR_NEM
+ help
+ Intel Geminilake support
+
+if SOC_INTEL_APOLLOLAKE
config SKIP_CSE_RBP
bool