summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2019-01-26 18:42:35 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-01-28 13:38:49 +0000
commit9e946079e82f1f2b7fbab498a9eec16d1fcd9216 (patch)
tree0206194637555fa77f5205a56b68892b3a2cc2d6 /src/soc
parentfaa3d4680c3adaa7e8397733392a6d089c459373 (diff)
downloadcoreboot-9e946079e82f1f2b7fbab498a9eec16d1fcd9216.tar.xz
soc/intel/skylake: select FSP_M_XIP if MAINBOARD_USES_FSP2_0
Select FSP_M_XIP if MAINBOARD_USES_FSP2_0, since all SkyKabylake boards require FSP-M XIP when FSP 2.0 is used, and since not having it selected results in a non-booting image. Also, put select FSP_T_XIP if FSP_CAR in proper alphabetical order. Change-Id: I6d3986eda18297b12490cefb236f5de5faca6550 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/31110 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/skylake/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index ec982d1a1f..506a04165b 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -28,6 +28,8 @@ config CPU_SPECIFIC_OPTIONS
select COMMON_FADT
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select C_ENVIRONMENT_BOOTBLOCK
+ select FSP_M_XIP if MAINBOARD_USES_FSP2_0
+ select FSP_T_XIP if FSP_CAR
select GENERIC_GPIO_LIB
select HAVE_FSP_GOP
select INTEL_DESCRIPTOR_MODE_CAPABLE
@@ -73,7 +75,6 @@ config CPU_SPECIFIC_OPTIONS
select TSC_MONOTONIC_TIMER
select TSC_SYNC_MFENCE
select UDELAY_TSC
- select FSP_T_XIP if FSP_CAR
config CPU_INTEL_NUM_FIT_ENTRIES
int