diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index 71a40c1ff4..613593edb7 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -8,24 +8,25 @@ if SOC_INTEL_BAYTRAIL
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select SMP
-	select SSE2
-	select UDELAY_TSC
-	select TSC_CONSTANT_RATE
-	select SMM_TSEG
-	select SMM_MODULES
-	select RELOCATABLE_MODULES
-	select DYNAMIC_CBMEM
-	select SUPPORT_CPU_UCODE_IN_CBFS
-	select TSC_SYNC_MFENCE
-	select CAR_MIGRATION
-	select MMCONF_SUPPORT
-	select MMCONF_SUPPORT_DEFAULT
-	select HAVE_SMI_HANDLER
 	select CACHE_MRC_SETTINGS
 	select CACHE_ROM
-	select SPI_FLASH
+	select CAR_MIGRATION
 	select COLLECT_TIMESTAMPS
+	select CPU_MICROCODE_IN_CBFS
+	select DYNAMIC_CBMEM
+	select HAVE_SMI_HANDLER
+	select MMCONF_SUPPORT
+	select MMCONF_SUPPORT_DEFAULT
+	select RELOCATABLE_MODULES
+	select SMM_MODULES
+	select SMM_TSEG
+	select SMP
+	select SPI_FLASH
+	select SSE2
+	select SUPPORT_CPU_UCODE_IN_CBFS
+	select TSC_CONSTANT_RATE
+	select TSC_SYNC_MFENCE
+	select UDELAY_TSC
 
 config BOOTBLOCK_CPU_INIT
 	string