diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index ece4d61510..1114ff0efa 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -40,6 +40,7 @@ config CPU_SPECIFIC_OPTIONS
 	select INTEL_GMA_SWSMISCI
 	select POSTCAR_STAGE
 	select POSTCAR_CONSOLE
+	select CPU_INTEL_COMMON
 
 config VBOOT
 	select VBOOT_STARTS_IN_ROMSTAGE
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index 3658f5a526..1debea9e2a 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -7,6 +7,7 @@ subdirs-y += ../../../cpu/x86/smm
 subdirs-y += ../../../cpu/x86/tsc
 subdirs-y += ../../../cpu/intel/microcode
 subdirs-y += ../../../cpu/intel/turbo
+subdirs-y += ../../../cpu/intel/common
 
 ramstage-y += memmap.c
 romstage-y += memmap.c
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 9bbeafbe76..6c37aa86b9 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
+#include <cpu/intel/common/common.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/turbo.h>
 #include <cpu/x86/cache.h>
@@ -55,6 +56,9 @@ static void baytrail_core_init(struct device *cpu)
 	if (lapicid())
 		enable_turbo();
 
+	/* Set virtualization based on Kconfig option */
+	set_vmx();
+
 	/* Set core MSRs */
 	reg_script_run(core_msr_script);