[commit] r5921 - in trunk/src/cpu: amd/model_10xxx amd/model_fxx amd/model_gx2 intel/model_1067x intel/model_106cx intel/model_69x intel/model_6dx intel/model_6ex intel/model_6fx intel/model_6xx in...

[repository service]

Author: uwe
Date: Fri Oct  8 01:42:17 2010
New Revision: 5921
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5921

Log:
Remove some duplicate #include files (trivial).

Signed-off-by: Uwe Hermann 
Acked-by: Uwe Hermann

Modified:
   trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c
   trunk/src/cpu/amd/model_fxx/model_fxx_init.c
   trunk/src/cpu/amd/model_fxx/model_fxx_update_microcode.c
   trunk/src/cpu/amd/model_gx2/model_gx2_init.c
   trunk/src/cpu/intel/model_1067x/model_1067x_init.c
   trunk/src/cpu/intel/model_106cx/model_106cx_init.c
   trunk/src/cpu/intel/model_69x/model_69x_init.c
   trunk/src/cpu/intel/model_6dx/model_6dx_init.c
   trunk/src/cpu/intel/model_6ex/model_6ex_init.c
   trunk/src/cpu/intel/model_6fx/model_6fx_init.c
   trunk/src/cpu/intel/model_6xx/model_6xx_init.c
   trunk/src/cpu/intel/model_f0x/model_f0x_init.c
   trunk/src/cpu/intel/model_f1x/model_f1x_init.c
   trunk/src/cpu/intel/model_f2x/model_f2x_init.c
   trunk/src/cpu/intel/model_f3x/model_f3x_init.c
   trunk/src/cpu/intel/model_f4x/model_f4x_init.c
   trunk/src/cpu/via/model_c3/model_c3_init.c
   trunk/src/cpu/via/model_c7/model_c7_init.c

Modified: trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c
==============================================================================
--- trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -27,9 +27,7 @@
 #include <cpu/x86/pae.h>
 #include <pc80/mc146818rtc.h>
 #include <cpu/x86/lapic.h>
-
 #include "northbridge/amd/amdfam10/amdfam10.h"
-
 #include <cpu/amd/model_10xxx_rev.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>

Modified: trunk/src/cpu/amd/model_fxx/model_fxx_init.c
==============================================================================
--- trunk/src/cpu/amd/model_fxx/model_fxx_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/amd/model_fxx/model_fxx_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -7,6 +7,7 @@
  * Copyright 2005 AMD
  * 2005.08 yhlu add microcode support
  */
+
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
@@ -17,17 +18,13 @@
 #include <cpu/x86/pae.h>
 #include <pc80/mc146818rtc.h>
 #include <cpu/x86/lapic.h>
-
 #include "northbridge/amd/amdk8/amdk8.h"
-
 #include <cpu/amd/model_fxx_rev.h>
 #include <cpu/amd/microcode.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
-
 #include <cpu/amd/multicore.h>
-
 #include <cpu/amd/model_fxx_msr.h>

#if CONFIG_WAIT_BEFORE_CPUS_INIT
@@ -110,6 +107,7 @@
    msr_t base;
    msr_t mask;
 };
+
 struct mtrr_state {
    struct mtrr mtrrs[MTRR_COUNT];
    msr_t top_mem, top_mem2;

Modified: trunk/src/cpu/amd/model_fxx/model_fxx_update_microcode.c
==============================================================================
--- trunk/src/cpu/amd/model_fxx/model_fxx_update_microcode.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/amd/model_fxx/model_fxx_update_microcode.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -19,16 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */

-/*
- * Description: Microcode patch support for k8 by yhlu
- */
-
-
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
-
 #include <cpu/amd/microcode.h>

static uint8_t microcode_updates[] __attribute__ ((aligned(16))) = {
@@ -80,7 +74,6 @@

};

-
    unsigned new_id;
    int i;

@@ -94,7 +87,6 @@
    }

return new_id;
-
 }

void model_fxx_update_microcode(unsigned cpu_deviceid)
@@ -105,6 +97,4 @@
    equivalent_processor_rev_id = get_equivalent_processor_rev_id(cpu_deviceid );
    if(equivalent_processor_rev_id != 0)
            amd_update_microcode(microcode_updates, equivalent_processor_rev_id);
-
 }
-

Modified: trunk/src/cpu/amd/model_gx2/model_gx2_init.c
==============================================================================
--- trunk/src/cpu/amd/model_gx2/model_gx2_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/amd/model_gx2/model_gx2_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -6,7 +6,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cache.h>

-
 static void vsm_end_post_smi(void)
 {
    __asm__ volatile (

Modified: trunk/src/cpu/intel/model_1067x/model_1067x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_1067x/model_1067x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_1067x/model_1067x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -30,7 +30,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>

static const uint32_t microcode_updates[] = {

Modified: trunk/src/cpu/intel/model_106cx/model_106cx_init.c
==============================================================================
--- trunk/src/cpu/intel/model_106cx/model_106cx_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_106cx/model_106cx_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -28,7 +28,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>
 #include <usbdebug.h>

Modified: trunk/src/cpu/intel/model_69x/model_69x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_69x/model_69x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_69x/model_69x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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,7 +8,6 @@
 #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[] = {
    /*  Dummy terminator  */
@@ -19,7 +17,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_69x_init(device_t dev)
 {
    /* Turn on caching if we haven't already */
@@ -37,6 +34,7 @@
 static struct device_operations cpu_dev_ops = {
    .init     = model_69x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
    { X86_VENDOR_INTEL, 0x0690 }, /* Pentium M */
    { X86_VENDOR_INTEL, 0x0695 },

Modified: trunk/src/cpu/intel/model_6dx/model_6dx_init.c
==============================================================================
--- trunk/src/cpu/intel/model_6dx/model_6dx_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_6dx/model_6dx_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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,7 +8,6 @@
 #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[] = {
    /*  Dummy terminator  */
@@ -19,7 +17,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_6dx_init(device_t dev)
 {
    /* Turn on caching if we haven't already */
@@ -37,6 +34,7 @@
 static struct device_operations cpu_dev_ops = {
    .init     = model_6dx_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
    { X86_VENDOR_INTEL, 0x06D0 }, /* Pentium M on 90nm with 2MiB of L2 cache */
    { X86_VENDOR_INTEL, 0x06D6 }, /* Pentium M on 90nm with 2MiB of L2 cache */

Modified: trunk/src/cpu/intel/model_6ex/model_6ex_init.c
==============================================================================
--- trunk/src/cpu/intel/model_6ex/model_6ex_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_6ex/model_6ex_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -30,7 +30,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>
 #include <usbdebug.h>

Modified: trunk/src/cpu/intel/model_6fx/model_6fx_init.c
==============================================================================
--- trunk/src/cpu/intel/model_6fx/model_6fx_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_6fx/model_6fx_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -30,7 +30,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/name.h>
 #include <usbdebug.h>

Modified: trunk/src/cpu/intel/model_6xx/model_6xx_init.c
==============================================================================
--- trunk/src/cpu/intel/model_6xx/model_6xx_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_6xx/model_6xx_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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,7 +8,6 @@
 #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
@@ -33,7 +31,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_6xx_init(device_t dev)
 {
    /* Turn on caching if we haven't already */

Modified: trunk/src/cpu/intel/model_f0x/model_f0x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_f0x/model_f0x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_f0x/model_f0x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>

/* 256KB cache */
 static uint32_t microcode_updates[] = {
@@ -25,7 +23,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_f0x_init(device_t dev)
 {
    /* Turn on caching if we haven't already */
@@ -43,6 +40,7 @@
 static struct device_operations cpu_dev_ops = {
    .init     = model_f0x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
    { X86_VENDOR_INTEL, 0x0f0A },
    { 0, 0 },

Modified: trunk/src/cpu/intel/model_f1x/model_f1x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_f1x/model_f1x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_f1x/model_f1x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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,7 +8,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>

/* 256KB cache */
 static uint32_t microcode_updates[] = {
@@ -25,7 +23,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_f1x_init(device_t dev)
 {
    /* Turn on caching if we haven't already */
@@ -43,6 +40,7 @@
 static struct device_operations cpu_dev_ops = {
    .init     = model_f1x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
    { X86_VENDOR_INTEL, 0x0f12 },
    { 0, 0 },

Modified: trunk/src/cpu/intel/model_f2x/model_f2x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_f2x/model_f2x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_f2x/model_f2x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -9,7 +9,6 @@
 #include <cpu/intel/microcode.h>
 #include <cpu/intel/hyperthreading.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>

/* 512KB cache */
 static uint32_t microcode_updates[] = {
@@ -49,6 +48,7 @@
 static struct device_operations cpu_dev_ops = {
    .init     = model_f2x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
    { X86_VENDOR_INTEL, 0x0f22 },
    { X86_VENDOR_INTEL, 0x0f24 },

Modified: trunk/src/cpu/intel/model_f3x/model_f3x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_f3x/model_f3x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_f3x/model_f3x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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>
@@ -10,7 +9,6 @@
 #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
@@ -29,7 +27,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_f3x_init(device_t cpu)
 {
    /* Turn on caching if we haven't already */
@@ -50,6 +47,7 @@
 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 },

Modified: trunk/src/cpu/intel/model_f4x/model_f4x_init.c
==============================================================================
--- trunk/src/cpu/intel/model_f4x/model_f4x_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/intel/model_f4x/model_f4x_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -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>
@@ -10,7 +9,6 @@
 #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
@@ -26,7 +24,6 @@
         0x0, 0x0, 0x0, 0x0,
 };

-
 static void model_f4x_init(device_t cpu)
 {
    /* Turn on caching if we haven't already */
@@ -47,6 +44,7 @@
 static struct device_operations cpu_dev_ops = {
    .init = model_f4x_init,
 };
+
 static struct cpu_device_id cpu_table[] = {
    { X86_VENDOR_INTEL, 0x0f41 }, /* Xeon */
    { 0, 0 },

Modified: trunk/src/cpu/via/model_c3/model_c3_init.c
==============================================================================
--- trunk/src/cpu/via/model_c3/model_c3_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/via/model_c3/model_c3_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -25,7 +25,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>

static void model_c3_init(device_t dev)
 {

Modified: trunk/src/cpu/via/model_c7/model_c7_init.c
==============================================================================
--- trunk/src/cpu/via/model_c7/model_c7_init.c	Fri Oct  8 01:02:06 2010	(r5920)
+++ trunk/src/cpu/via/model_c7/model_c7_init.c	Fri Oct  8 01:42:17 2010	(r5921)
@@ -23,13 +23,11 @@
 #include <console/console.h>
 #include <delay.h>
 #include <stdlib.h>
-
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>

#define MSR_IA32_PERF_STATUS	0x00000198
 #define MSR_IA32_PERF_CTL	0x00000199