Remove some duplicate #include files (trivial).

[coreboot.git] / src / cpu / intel / model_f3x / model_f3x_init.c

diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index ce5705b0819b2a0301cca611ff88b687c11b0ff4..f04ddcc0ce545d6fbda41ff5770c7582fec0ee12 100644 (file)
--- a/src/cpu/intel/model_f3x/model_f3x_init.c
+++ b/src/cpu/intel/model_f3x/model_f3x_init.c
@@ -1,7 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
-#include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -11,15 +9,17 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 
 static uint32_t microcode_updates[] = {
        /* WARNING - Intel has a new data structure that has variable length
         * microcode update lengths.  They are encoded in int 8 and 9.  A
         * dummy header of nulls must terminate the list.
         */
-       
-#include "microcode_M1DF3413.h"
+
+#include "microcode-1290-m0df320a.h"
+#include "microcode-1467-m0df330c.h"
+#include "microcode-1468-m1df3417.h"
+
        /*  Dummy terminator  */
         0x0, 0x0, 0x0, 0x0,
         0x0, 0x0, 0x0, 0x0,
@@ -27,14 +27,13 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_f3x_init(device_t cpu)
 {
        /* Turn on caching if we haven't already */
        x86_enable_cache();
-       x86_setup_mtrrs();
+       x86_setup_mtrrs(36);
        x86_mtrr_check();
-       
+
        /* Update the microcode */
        intel_update_microcode(microcode_updates);
 
@@ -48,12 +47,13 @@ static void model_f3x_init(device_t cpu)
 static struct device_operations cpu_dev_ops = {
        .init = model_f3x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
        { X86_VENDOR_INTEL, 0x0f34 }, /* Xeon */
        { 0, 0 },
 };
 
-static struct cpu_driver model_f3x __cpu_driver = {
+static const struct cpu_driver model_f3x __cpu_driver = {
        .ops      = &cpu_dev_ops,
        .id_table = cpu_table,
 };