diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index c4855da7ff..33025eba52 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -8,6 +8,7 @@ config SOC_INTEL_COFFEELAKE
 	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
@@ -16,6 +17,7 @@ config SOC_INTEL_WHISKEYLAKE
 	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
@@ -23,6 +25,7 @@ config SOC_INTEL_COMETLAKE
 	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
@@ -71,7 +74,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_HYPERTHREADING
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
-	select INTEL_CAR_NEM_ENHANCED
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP