summaryrefslogtreecommitdiff
path: root/src/cpu/intel/model_69x
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/intel/model_69x')
-rw-r--r--src/cpu/intel/model_69x/Kconfig1
-rw-r--r--src/cpu/intel/model_69x/Makefile.inc2
-rw-r--r--src/cpu/intel/model_69x/microcode_blob.c11
-rw-r--r--src/cpu/intel/model_69x/model_69x_init.c14
4 files changed, 15 insertions, 13 deletions
diff --git a/src/cpu/intel/model_69x/Kconfig b/src/cpu/intel/model_69x/Kconfig
index 596763cf35..4e88979c5f 100644
--- a/src/cpu/intel/model_69x/Kconfig
+++ b/src/cpu/intel/model_69x/Kconfig
@@ -1,3 +1,4 @@
config CPU_INTEL_MODEL_69X
bool
select SMP
+ select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_69x/Makefile.inc b/src/cpu/intel/model_69x/Makefile.inc
index 927bfeb06d..e9d90ca871 100644
--- a/src/cpu/intel/model_69x/Makefile.inc
+++ b/src/cpu/intel/model_69x/Makefile.inc
@@ -1 +1,3 @@
ramstage-y += model_69x_init.c
+
+cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
diff --git a/src/cpu/intel/model_69x/microcode_blob.c b/src/cpu/intel/model_69x/microcode_blob.c
new file mode 100644
index 0000000000..4b06772387
--- /dev/null
+++ b/src/cpu/intel/model_69x/microcode_blob.c
@@ -0,0 +1,11 @@
+unsigned microcode_updates_69x[] = {
+ #include "microcode-1376-m8069547.h"
+ #include "microcode-1373-m1069507.h"
+ #include "microcode-1374-m2069507.h"
+
+ /* Dummy terminator */
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0,
+};
diff --git a/src/cpu/intel/model_69x/model_69x_init.c b/src/cpu/intel/model_69x/model_69x_init.c
index cb805aec51..9ee7424eb7 100644
--- a/src/cpu/intel/model_69x/model_69x_init.c
+++ b/src/cpu/intel/model_69x/model_69x_init.c
@@ -9,18 +9,6 @@
#include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h>
-static uint32_t microcode_updates[] = {
- #include "microcode-1376-m8069547.h"
- #include "microcode-1373-m1069507.h"
- #include "microcode-1374-m2069507.h"
-
- /* Dummy terminator */
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0,
-};
-
static void model_69x_init(device_t dev)
{
/* Turn on caching if we haven't already */
@@ -29,7 +17,7 @@ static void model_69x_init(device_t dev)
x86_mtrr_check();
/* Update the microcode */
- intel_update_microcode(microcode_updates);
+ intel_update_microcode_from_cbfs();
/* Enable the local cpu apics */
setup_lapic();