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