diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index b58dfd3..80237f9 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -13,11 +13,13 @@
 	select FSP_COMPRESS_FSP_S_LZMA
 	select FSP_M_XIP
 	select FSP_STATUS_GLOBAL_RESET_REQUIRED_3
+	select FSP_USES_CB_STACK
 	select GENERIC_GPIO_LIB
 	select HAVE_DPTF_EISA_HID
 	select HAVE_FSP_GOP
 	select HAVE_FSP_LOGO_SUPPORT
 	select HAVE_HYPERTHREADING
+	select HAVE_INTEL_FSP_REPO
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
@@ -58,6 +60,7 @@
 	select SOC_INTEL_COMMON_NHLT
 	select SOC_INTEL_COMMON_PCH_CLIENT
 	select SOC_INTEL_COMMON_RESET
+	select SOC_INTEL_CONFIGURE_DDI_A_4_LANES
 	select SOC_INTEL_MEM_MAPPED_PM_CONFIGURATION
 	select SSE2
 	select SUPPORT_CPU_UCODE_IN_CBFS
@@ -72,30 +75,21 @@
 config SOC_INTEL_COFFEELAKE
 	bool
 	select SOC_INTEL_CANNONLAKE_BASE
-	select FSP_USES_CB_STACK
 	select HAVE_EXP_X86_64_SUPPORT
-	select HAVE_INTEL_FSP_REPO
 	select HECI_DISABLE_USING_SMM
 	select INTEL_CAR_NEM
-	select SOC_INTEL_CONFIGURE_DDI_A_4_LANES
 
 config SOC_INTEL_WHISKEYLAKE
 	bool
 	select SOC_INTEL_CANNONLAKE_BASE
-	select FSP_USES_CB_STACK
-	select HAVE_INTEL_FSP_REPO
 	select HECI_DISABLE_USING_SMM
 	select INTEL_CAR_NEM_ENHANCED
-	select SOC_INTEL_CONFIGURE_DDI_A_4_LANES
 
 config SOC_INTEL_COMETLAKE
 	bool
 	select SOC_INTEL_CANNONLAKE_BASE
-	select FSP_USES_CB_STACK
-	select HAVE_INTEL_FSP_REPO
 	select INTEL_CAR_NEM_ENHANCED
 	select PMC_IPC_ACPI_INTERFACE if DISABLE_HECI1_AT_PRE_BOOT
-	select SOC_INTEL_CONFIGURE_DDI_A_4_LANES
 	select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC
 	select SOC_INTEL_COMMON_BASECODE
 	select SOC_INTEL_COMMON_BASECODE_RAMTOP