From 9e946079e82f1f2b7fbab498a9eec16d1fcd9216 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sat, 26 Jan 2019 18:42:35 -0600 Subject: 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 Reviewed-on: https://review.coreboot.org/c/31110 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Arthur Heymans --- src/soc/intel/skylake/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3