summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/skylake/Kconfig')
-rw-r--r--src/soc/intel/skylake/Kconfig35
1 files changed, 7 insertions, 28 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 8bdd9b56d9..6ceb9f680b 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -10,7 +10,6 @@ config SOC_INTEL_SKYLAKE
config SOC_INTEL_KABYLAKE
bool
select SOC_INTEL_COMMON_SKYLAKE_BASE
- select MAINBOARD_USES_FSP2_0
help
Intel Kabylake support
@@ -33,7 +32,7 @@ config CPU_SPECIFIC_OPTIONS
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select CPU_INTEL_COMMON_HYPERTHREADING
select C_ENVIRONMENT_BOOTBLOCK
- select FSP_M_XIP if MAINBOARD_USES_FSP2_0
+ select FSP_M_XIP
select FSP_T_XIP if FSP_CAR
select GENERIC_GPIO_LIB
select HAVE_FSP_GOP
@@ -41,12 +40,14 @@ config CPU_SPECIFIC_OPTIONS
select HAVE_SMI_HANDLER
select INTEL_CAR_NEM_ENHANCED
select INTEL_GMA_ACPI
+ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
select IOAPIC
select MRC_SETTINGS_PROTECT
select NO_FIXED_XIP_ROM_SIZE
select PARALLEL_MP
select PARALLEL_MP_AP_WORK
select PCIEX_LENGTH_64MB
+ select PLATFORM_USES_FSP2_0
select REG_SCRIPT
select SA_ENABLE_DPR
select SMP
@@ -78,34 +79,16 @@ config CPU_SPECIFIC_OPTIONS
select TSC_MONOTONIC_TIMER
select TSC_SYNC_MFENCE
select UDELAY_TSC
+ select UDK_2015_BINDING
config FSP_HYPERTHREADING
bool "Enable Hyper-Threading"
- depends on MAINBOARD_USES_FSP2_0
default y
config CPU_INTEL_NUM_FIT_ENTRIES
int
default 10
-config MAINBOARD_USES_FSP2_0
- bool
- default n
-
-config USE_FSP2_0_DRIVER
- def_bool y
- depends on MAINBOARD_USES_FSP2_0
- select PLATFORM_USES_FSP2_0
- select UDK_2015_BINDING
- select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
-
-config USE_FSP1_1_DRIVER
- def_bool y
- depends on !MAINBOARD_USES_FSP2_0
- select PLATFORM_USES_FSP1_1
- select DISPLAY_FSP_ENTRY_POINTS
- select SKIP_FSP_CAR
-
config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
@@ -243,17 +226,14 @@ config NHLT_DA7219
config FSP_HEADER_PATH
string "Location of FSP headers"
- depends on MAINBOARD_USES_FSP2_0
# Use KabylakeFsp for both Skylake and Kabylake as it supports both.
# SkylakeFsp is FSP 1.1 and therefore incompatible.
- default "3rdparty/fsp/KabylakeFspBinPkg/Include/" if SOC_INTEL_SKYLAKE
- default "3rdparty/fsp/KabylakeFspBinPkg/Include/" if SOC_INTEL_KABYLAKE
+ default "3rdparty/fsp/KabylakeFspBinPkg/Include/"
config FSP_FD_PATH
string
depends on FSP_USE_REPO
- default "3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd" if SOC_INTEL_SKYLAKE
- default "3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd" if SOC_INTEL_KABYLAKE
+ default "3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
config SPI_FLASH_INCLUDE_ALL_DRIVERS
bool
@@ -261,8 +241,7 @@ config SPI_FLASH_INCLUDE_ALL_DRIVERS
config MAX_ROOT_PORTS
int
- default 24 if PLATFORM_USES_FSP2_0
- default 20 if PLATFORM_USES_FSP1_1
+ default 24
config NO_FADT_8042
bool