diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index ed9894eeb7..9813d2debd 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -14,6 +14,7 @@ config CPU_SPECIFIC_OPTIONS
 	select CAR_MIGRATION
 	select COLLECT_TIMESTAMPS
 	select CPU_MICROCODE_IN_CBFS
+	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
 	select DYNAMIC_CBMEM
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index cf32c54f75..aff6c557b2 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -92,7 +92,7 @@ void baytrail_init_cpus(device_t dev)
 	/* Set package MSRs */
 	reg_script_run(package_msr_script);
 
-	/* Enable Turbo/Burst Mode */
+	/* Enable Turbo Mode on BSP and siblings of the BSP's building block. */
 	enable_turbo();
 
 	if (mp_init(cpu_bus, &mp_params)) {
@@ -104,6 +104,13 @@ static void baytrail_core_init(device_t cpu)
 {
 	printk(BIOS_DEBUG, "Init BayTrail core.\n");
 
+	/* On bay trail the turbo disable bit is actually scoped at building
+	 * block level -- not package. For non-bsp cores that are within a
+	 * building block enable turbo. The cores within the BSP's building
+	 * block will just see it already enabled and move on. */
+	if (lapicid())
+		enable_turbo();
+
 	/* Set core MSRs */
 	reg_script_run(core_msr_script);