summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/skylake/bootblock/cpu.c3
-rw-r--r--src/soc/intel/skylake/cpu.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/intel/skylake/bootblock/cpu.c b/src/soc/intel/skylake/bootblock/cpu.c
index 6963b829ea..ee344efb13 100644
--- a/src/soc/intel/skylake/bootblock/cpu.c
+++ b/src/soc/intel/skylake/bootblock/cpu.c
@@ -16,7 +16,7 @@
#include <arch/io.h>
#include <console/console.h>
-#include <cpu/intel/microcode/microcode.c>
+#include <cpu/x86/msr.h>
#include <delay.h>
#include <intelblocks/fast_spi.h>
#include <reset.h>
@@ -89,7 +89,6 @@ void bootblock_cpu_init(void)
fast_spi_cache_bios_region();
/* Set flex ratio and reset if needed */
set_flex_ratio_to_tdp_nominal();
- intel_update_microcode_from_cbfs();
}
void set_max_freq(void)
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index d1ed146c1b..a40aefcf4f 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -480,6 +480,7 @@ static void get_microcode_info(const void **microcode, int *parallel)
microcode_patch = intel_microcode_find();
*microcode = microcode_patch;
*parallel = 1;
+ intel_microcode_load_unlocked(microcode_patch);
}
static int adjust_apic_id(int index, int apic_id)