Remove some duplicate #include files (trivial).

[coreboot.git] / src / cpu / intel / model_6xx / model_6xx_init.c

diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c
index cf0383f46a6754d2571b8f2757258af597802a04..5b8dd3519bce1bb22a330e134366ae215415c341 100644 (file)
--- a/src/cpu/intel/model_6xx/model_6xx_init.c
+++ b/src/cpu/intel/model_6xx/model_6xx_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
 #include <cpu/cpu.h>
@@ -9,15 +8,22 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.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_MU16810d.h"        
-#include "microcode_MU16830c.h"
+#include "microcode-534-MU16810d.h"
+#include "microcode-535-MU16810e.h"
+#include "microcode-536-MU16810f.h"
+#include "microcode-538-MU168111.h"
+
+#include "microcode-550-MU168307.h"
+#include "microcode-551-MU168308.h"
+#include "microcode-727-MU168313.h"
+#include "microcode-728-MU168314.h"
+
        /*  Dummy terminator  */
         0x0, 0x0, 0x0, 0x0,
         0x0, 0x0, 0x0, 0x0,
@@ -25,14 +31,13 @@ static uint32_t microcode_updates[] = {
         0x0, 0x0, 0x0, 0x0,
 };
 
-
 static void model_6xx_init(device_t dev)
 {
        /* Turn on caching if we haven't already */
        x86_enable_cache();
        x86_setup_mtrrs(36);
        x86_mtrr_check();
-       
+
        /* Update the microcode */
        intel_update_microcode(microcode_updates);
 
@@ -43,19 +48,67 @@ static void model_6xx_init(device_t dev)
 static struct device_operations cpu_dev_ops = {
        .init     = model_6xx_init,
 };
+
+/*
+ * Intel Pentium Pro Processor Specification Update
+ * http://download.intel.com/design/archives/processors/pro/docs/24268935.pdf
+ *
+ * Intel Pentium II Processor Specification Update
+ * http://download.intel.com/design/PentiumII/specupdt/24333749.pdf
+ *
+ * Mobile Intel Pentium II Processor Specification Update
+ * http://download.intel.com/design/intarch/specupdt/24388757.pdf
+ *
+ * Intel Celeron Processor Identification Information
+ * http://www.intel.com/design/celeron/qit/update.pdf
+ *
+ * Intel Pentium II Xeon Processor Specification Update
+ * http://download.intel.com/support/processors/pentiumii/xeon/24377632.pdf
+ *
+ * Intel Pentium III Processor Identification and Package Information
+ * http://www.intel.com/design/pentiumiii/qit/update.pdf
+ *
+ * Intel Pentium III Processor Specification Update
+ * http://download.intel.com/design/intarch/specupdt/24445358.pdf
+ *
+ * Mobile Intel Pentium III/III-M Processor Specification Update
+ * http://download.intel.com/design/intarch/specupdt/24530663.pdf
+ */
 static struct cpu_device_id cpu_table[] = {
-       { X86_VENDOR_INTEL, 0x0672 },
-       { X86_VENDOR_INTEL, 0x0673 },
-       { X86_VENDOR_INTEL, 0x0681 },
-       { X86_VENDOR_INTEL, 0x0683 },
-       { X86_VENDOR_INTEL, 0x0686 },
-       { X86_VENDOR_INTEL, 0x06A0 },
-       { X86_VENDOR_INTEL, 0x06A1 },
-       { X86_VENDOR_INTEL, 0x06A4 },
+       { X86_VENDOR_INTEL, 0x0611 }, /* Pentium Pro, B0 */
+       { X86_VENDOR_INTEL, 0x0612 }, /* Pentium Pro, C0 */
+       { X86_VENDOR_INTEL, 0x0616 }, /* Pentium Pro, sA0 */
+       { X86_VENDOR_INTEL, 0x0617 }, /* Pentium Pro, sA1 */
+       { X86_VENDOR_INTEL, 0x0619 }, /* Pentium Pro, sB1 */
+
+       { X86_VENDOR_INTEL, 0x0633 }, /* PII, C0 */
+       { X86_VENDOR_INTEL, 0x0634 }, /* PII, C1 */
+
+       { X86_VENDOR_INTEL, 0x0650 }, /* PII/Celeron, dA0/mdA0/A0 */
+       { X86_VENDOR_INTEL, 0x0651 }, /* PII/Celeron, dA1/A1 */
+       { X86_VENDOR_INTEL, 0x0652 }, /* PII/Celeron/Xeon, dB0/mdB0/B0 */
+       { X86_VENDOR_INTEL, 0x0653 }, /* PII/Xeon, dB1/B1 */
+
+       { X86_VENDOR_INTEL, 0x0660 }, /* Celeron, A0 */
+       { X86_VENDOR_INTEL, 0x0665 }, /* Celeron, B0 */
+       { X86_VENDOR_INTEL, 0x066a }, /* PII, mdxA0/dmmA0 + others */
+
+       { X86_VENDOR_INTEL, 0x0672 }, /* PIII, kB0 */
+       { X86_VENDOR_INTEL, 0x0673 }, /* PIII, kC0 */
+
+       { X86_VENDOR_INTEL, 0x0680 },
+       { X86_VENDOR_INTEL, 0x0681 }, /* PIII, cA2/cA2c/A2/BA2/PA2/MA2 */
+       { X86_VENDOR_INTEL, 0x0683 }, /* PIII/Celeron, cB0/cB0c/B0/BB0/PB0/MB0*/
+       { X86_VENDOR_INTEL, 0x0686 }, /* PIII/Celeron, cC0/C0/BC0/PC0/MC0 */
+       { X86_VENDOR_INTEL, 0x068a }, /* PIII/Celeron, cD0/D0/BD0/PD0 */
+
+       { X86_VENDOR_INTEL, 0x06a0 }, /* PIII, A0 */
+       { X86_VENDOR_INTEL, 0x06a1 }, /* PIII, A1 */
+       { X86_VENDOR_INTEL, 0x06a4 }, /* PIII, B0 */
        { 0, 0 },
 };
 
-static struct cpu_driver driver __cpu_driver = {
+static const struct cpu_driver driver __cpu_driver = {
        .ops      = &cpu_dev_ops,
        .id_table = cpu_table,
 };