sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some duplicate #include files (trivial).

Browse Source 
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5921 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2010-10-07 23:42:17 +00:00
parent e5b7507882
commit 554c052b48
18 changed files with 9 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/amd/model_10xxx/model_10xxx_init.c
View File

@ -27,9 +27,7 @@
#include <cpu/x86/pae.h> #include <cpu/x86/pae.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/amdfam10.h" #include "northbridge/amd/amdfam10/amdfam10.h"
#include <cpu/amd/model_10xxx_rev.h> #include <cpu/amd/model_10xxx_rev.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>

6
src/cpu/amd/model_fxx/model_fxx_init.c
View File

@ -7,6 +7,7 @@
* Copyright 2005 AMD * Copyright 2005 AMD
* 2005.08 yhlu add microcode support * 2005.08 yhlu add microcode support
*/ */
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h> #include <cpu/amd/mtrr.h>
@ -17,17 +18,13 @@
#include <cpu/x86/pae.h> #include <cpu/x86/pae.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/amdk8.h" #include "northbridge/amd/amdk8/amdk8.h"
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include <cpu/amd/microcode.h> #include <cpu/amd/microcode.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <cpu/amd/multicore.h> #include <cpu/amd/multicore.h>
#include <cpu/amd/model_fxx_msr.h> #include <cpu/amd/model_fxx_msr.h>
#if CONFIG_WAIT_BEFORE_CPUS_INIT #if CONFIG_WAIT_BEFORE_CPUS_INIT
@ -110,6 +107,7 @@ struct mtrr {
msr_t base; msr_t base;
msr_t mask; msr_t mask;
}; };
struct mtrr_state { struct mtrr_state {
struct mtrr mtrrs[MTRR_COUNT]; struct mtrr mtrrs[MTRR_COUNT];
msr_t top_mem, top_mem2; msr_t top_mem, top_mem2;

10
src/cpu/amd/model_fxx/model_fxx_update_microcode.c
View File

@ -19,16 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 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 <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/amd/microcode.h> #include <cpu/amd/microcode.h>
static uint8_t microcode_updates[] __attribute__ ((aligned(16))) = { static uint8_t microcode_updates[] __attribute__ ((aligned(16))) = {
@ -80,7 +74,6 @@ static unsigned get_equivalent_processor_rev_id(unsigned orig_id) {
}; };
unsigned new_id; unsigned new_id;
int i; int i;
@ -94,7 +87,6 @@ static unsigned get_equivalent_processor_rev_id(unsigned orig_id) {
} }
return new_id; return new_id;
} }
void model_fxx_update_microcode(unsigned cpu_deviceid) void model_fxx_update_microcode(unsigned cpu_deviceid)
@ -105,6 +97,4 @@ void model_fxx_update_microcode(unsigned cpu_deviceid)
equivalent_processor_rev_id = get_equivalent_processor_rev_id(cpu_deviceid ); equivalent_processor_rev_id = get_equivalent_processor_rev_id(cpu_deviceid );
if(equivalent_processor_rev_id != 0) if(equivalent_processor_rev_id != 0)
amd_update_microcode(microcode_updates, equivalent_processor_rev_id); amd_update_microcode(microcode_updates, equivalent_processor_rev_id);
} }

1
src/cpu/amd/model_gx2/model_gx2_init.c
View File

@ -6,7 +6,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
static void vsm_end_post_smi(void) static void vsm_end_post_smi(void)
{ {
__asm__ volatile ( __asm__ volatile (

1
src/cpu/intel/model_1067x/model_1067x_init.c
View File

@ -30,7 +30,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/name.h> #include <cpu/x86/name.h>
static const uint32_t microcode_updates[] = { static const uint32_t microcode_updates[] = {

1
src/cpu/intel/model_106cx/model_106cx_init.c
View File

@ -28,7 +28,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/name.h> #include <cpu/x86/name.h>
#include <usbdebug.h> #include <usbdebug.h>

4
src/cpu/intel/model_69x/model_69x_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -9,7 +8,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
/* Dummy terminator */ /* Dummy terminator */
@ -19,7 +17,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_69x_init(device_t dev) static void model_69x_init(device_t dev)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
@ -37,6 +34,7 @@ static void model_69x_init(device_t dev)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_69x_init, .init = model_69x_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0690 }, /* Pentium M */ { X86_VENDOR_INTEL, 0x0690 }, /* Pentium M */
{ X86_VENDOR_INTEL, 0x0695 }, { X86_VENDOR_INTEL, 0x0695 },

4
src/cpu/intel/model_6dx/model_6dx_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -9,7 +8,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
/* Dummy terminator */ /* Dummy terminator */
@ -19,7 +17,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_6dx_init(device_t dev) static void model_6dx_init(device_t dev)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
@ -37,6 +34,7 @@ static void model_6dx_init(device_t dev)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_6dx_init, .init = model_6dx_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x06D0 }, /* Pentium M on 90nm with 2MiB of L2 cache */ { 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 */ { X86_VENDOR_INTEL, 0x06D6 }, /* Pentium M on 90nm with 2MiB of L2 cache */

1
src/cpu/intel/model_6ex/model_6ex_init.c
View File

@ -30,7 +30,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/name.h> #include <cpu/x86/name.h>
#include <usbdebug.h> #include <usbdebug.h>

1
src/cpu/intel/model_6fx/model_6fx_init.c
View File

@ -30,7 +30,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/name.h> #include <cpu/x86/name.h>
#include <usbdebug.h> #include <usbdebug.h>

3
src/cpu/intel/model_6xx/model_6xx_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -9,7 +8,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
/* WARNING - Intel has a new data structure that has variable length /* WARNING - Intel has a new data structure that has variable length
@ -33,7 +31,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_6xx_init(device_t dev) static void model_6xx_init(device_t dev)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */

4
src/cpu/intel/model_f0x/model_f0x_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -9,7 +8,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
/* 256KB cache */ /* 256KB cache */
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
@ -25,7 +23,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_f0x_init(device_t dev) static void model_f0x_init(device_t dev)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
@ -43,6 +40,7 @@ static void model_f0x_init(device_t dev)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_f0x_init, .init = model_f0x_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f0A }, { X86_VENDOR_INTEL, 0x0f0A },
{ 0, 0 }, { 0, 0 },

4
src/cpu/intel/model_f1x/model_f1x_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -9,7 +8,6 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
/* 256KB cache */ /* 256KB cache */
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
@ -25,7 +23,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_f1x_init(device_t dev) static void model_f1x_init(device_t dev)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
@ -43,6 +40,7 @@ static void model_f1x_init(device_t dev)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_f1x_init, .init = model_f1x_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f12 }, { X86_VENDOR_INTEL, 0x0f12 },
{ 0, 0 }, { 0, 0 },

2
src/cpu/intel/model_f2x/model_f2x_init.c
View File

@ -9,7 +9,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
/* 512KB cache */ /* 512KB cache */
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
@ -49,6 +48,7 @@ static void model_f2x_init(device_t cpu)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_f2x_init, .init = model_f2x_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f22 }, { X86_VENDOR_INTEL, 0x0f22 },
{ X86_VENDOR_INTEL, 0x0f24 }, { X86_VENDOR_INTEL, 0x0f24 },

4
src/cpu/intel/model_f3x/model_f3x_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -10,7 +9,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
/* WARNING - Intel has a new data structure that has variable length /* WARNING - Intel has a new data structure that has variable length
@ -29,7 +27,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_f3x_init(device_t cpu) static void model_f3x_init(device_t cpu)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
@ -50,6 +47,7 @@ static void model_f3x_init(device_t cpu)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_f3x_init, .init = model_f3x_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f34 }, /* Xeon */ { X86_VENDOR_INTEL, 0x0f34 }, /* Xeon */
{ 0, 0 }, { 0, 0 },

4
src/cpu/intel/model_f4x/model_f4x_init.c
View File

@ -1,6 +1,5 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
@ -10,7 +9,6 @@
#include <cpu/intel/microcode.h> #include <cpu/intel/microcode.h>
#include <cpu/intel/hyperthreading.h> #include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
static uint32_t microcode_updates[] = { static uint32_t microcode_updates[] = {
/* WARNING - Intel has a new data structure that has variable length /* WARNING - Intel has a new data structure that has variable length
@ -26,7 +24,6 @@ static uint32_t microcode_updates[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
}; };
static void model_f4x_init(device_t cpu) static void model_f4x_init(device_t cpu)
{ {
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
@ -47,6 +44,7 @@ static void model_f4x_init(device_t cpu)
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {
.init = model_f4x_init, .init = model_f4x_init,
}; };
static struct cpu_device_id cpu_table[] = { static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f41 }, /* Xeon */ { X86_VENDOR_INTEL, 0x0f41 }, /* Xeon */
{ 0, 0 }, { 0, 0 },

1
src/cpu/via/model_c3/model_c3_init.c
View File

@ -25,7 +25,6 @@
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
static void model_c3_init(device_t dev) static void model_c3_init(device_t dev)
{ {

2
src/cpu/via/model_c7/model_c7_init.c
View File

@ -23,13 +23,11 @@
#include <console/console.h> #include <console/console.h>
#include <delay.h> #include <delay.h>
#include <stdlib.h> #include <stdlib.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h>
#define MSR_IA32_PERF_STATUS 0x00000198 #define MSR_IA32_PERF_STATUS 0x00000198
#define MSR_IA32_PERF_CTL 0x00000199 #define MSR_IA32_PERF_CTL 0x00000199