diff options
Diffstat (limited to 'src')
53 files changed, 52 insertions, 76 deletions
diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c index ac201e4f41..3a56fdd1c3 100644 --- a/src/cpu/amd/dualcore/amd_sibling.c +++ b/src/cpu/amd/dualcore/amd_sibling.c @@ -3,7 +3,7 @@ #include <console/console.h> #include <cpu/cpu.h> #include <cpu/x86/lapic.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #include <device/device.h> #include <device/pci.h> #include <pc80/mc146818rtc.h> diff --git a/src/cpu/amd/dualcore/dualcore_id.c b/src/cpu/amd/dualcore/dualcore_id.c index 33355cd558..a2b180b2b6 100644 --- a/src/cpu/amd/dualcore/dualcore_id.c +++ b/src/cpu/amd/dualcore/dualcore_id.c @@ -1,7 +1,7 @@ /* 2004.12 yhlu add dual core support */ #include <arch/cpu.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #ifdef __PRE_RAM__ #include <cpu/amd/model_fxx_msr.h> #endif diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/model_10xxx/model_10xxx_init.c index 407121d2d8..8aac3e89ec 100644 --- a/src/cpu/amd/model_10xxx/model_10xxx_init.c +++ b/src/cpu/amd/model_10xxx/model_10xxx_init.c @@ -34,7 +34,7 @@ #include <cpu/cpu.h> #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #include <cpu/amd/model_10xxx_msr.h> extern device_t get_node_pci(u32 nodeid, u32 fn); diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 47eae695e8..165155f2ed 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -26,7 +26,7 @@ #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #include <cpu/amd/model_fxx_msr.h> diff --git a/src/cpu/amd/quadcore/quadcore_id.c b/src/cpu/amd/quadcore/quadcore_id.c index 52f5e63f79..9e4da8b90f 100644 --- a/src/cpu/amd/quadcore/quadcore_id.c +++ b/src/cpu/amd/quadcore/quadcore_id.c @@ -19,7 +19,7 @@ #include <arch/cpu.h> -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #ifdef __PRE_RAM__ #include <cpu/amd/model_10xxx_msr.h> #endif diff --git a/src/include/cpu/amd/dualcore.h b/src/include/cpu/amd/dualcore.h deleted file mode 100644 index 58cf945aba..0000000000 --- a/src/include/cpu/amd/dualcore.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CPU_AMD_DUALCORE_H -#define CPU_AMD_DUALCORE_H - -#if defined(__GNUC__) -unsigned int read_nb_cfg_54(void); -#endif - -struct node_core_id { - unsigned nodeid; - unsigned coreid; -}; - -#if defined(__GNUC__) -// it can be used to get unitid and coreid it running only -struct node_core_id get_node_core_id(unsigned int nb_cfg_54); -#endif - -#if !defined(__PRE_RAM__) -struct device; -unsigned get_apicid_base(unsigned ioapic_num); -void amd_sibling_init(struct device *cpu); -#endif - -#endif /* CPU_AMD_DUALCORE_H */ diff --git a/src/include/cpu/amd/quadcore.h b/src/include/cpu/amd/multicore.h index 7bf84b4bce..47328ef80d 100644 --- a/src/include/cpu/amd/quadcore.h +++ b/src/include/cpu/amd/multicore.h @@ -21,7 +21,7 @@ #define CPU_AMD_QUADCORE_H #if defined(__GNUC__) -unsigned int read_nb_cfg_54(void); +u32 read_nb_cfg_54(void); #endif struct node_core_id { diff --git a/src/mainboard/amd/dbm690t/get_bus_conf.c b/src/mainboard/amd/dbm690t/get_bus_conf.c index 90c98a3ac7..79020b3faf 100644 --- a/src/mainboard/amd/dbm690t/get_bus_conf.c +++ b/src/mainboard/amd/dbm690t/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/amd/mahogany/get_bus_conf.c b/src/mainboard/amd/mahogany/get_bus_conf.c index 25d83d6005..1c319ec585 100644 --- a/src/mainboard/amd/mahogany/get_bus_conf.c +++ b/src/mainboard/amd/mahogany/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c index f77b4deab2..672f9e9efb 100644 --- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c +++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/amd/pistachio/get_bus_conf.c b/src/mainboard/amd/pistachio/get_bus_conf.c index 90c98a3ac7..79020b3faf 100644 --- a/src/mainboard/amd/pistachio/get_bus_conf.c +++ b/src/mainboard/amd/pistachio/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c index c7d19adbbb..c6a929904b 100644 --- a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c +++ b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c index 3e1e9b276e..0d979b5599 100644 --- a/src/mainboard/amd/serengeti_cheetah/mptable.c +++ b/src/mainboard/amd/serengeti_cheetah/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c index 8e3dcf1b84..72df5ba78d 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c @@ -23,7 +23,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c index 9627151560..8a6cfdf97d 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c @@ -23,7 +23,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/asus/a8n_e/get_bus_conf.c b/src/mainboard/asus/a8n_e/get_bus_conf.c index bcc34ffa59..4ce86b51cd 100644 --- a/src/mainboard/asus/a8n_e/get_bus_conf.c +++ b/src/mainboard/asus/a8n_e/get_bus_conf.c @@ -28,7 +28,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS == 1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> #include <stdlib.h> diff --git a/src/mainboard/broadcom/blast/get_bus_conf.c b/src/mainboard/broadcom/blast/get_bus_conf.c index cfe5257080..2d42bcc7d8 100644 --- a/src/mainboard/broadcom/blast/get_bus_conf.c +++ b/src/mainboard/broadcom/blast/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/broadcom/blast/mptable.c b/src/mainboard/broadcom/blast/mptable.c index 313a34a67c..74b1a36e1d 100644 --- a/src/mainboard/broadcom/blast/mptable.c +++ b/src/mainboard/broadcom/blast/mptable.c @@ -5,7 +5,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c index 3746918dd3..74e7f109c1 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/gigabyte/m57sli/get_bus_conf.c b/src/mainboard/gigabyte/m57sli/get_bus_conf.c index 9e5a1b09a1..771adf5ebf 100644 --- a/src/mainboard/gigabyte/m57sli/get_bus_conf.c +++ b/src/mainboard/gigabyte/m57sli/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/hp/dl145_g3/get_bus_conf.c b/src/mainboard/hp/dl145_g3/get_bus_conf.c index cace2d1ea0..c8090b97d0 100644 --- a/src/mainboard/hp/dl145_g3/get_bus_conf.c +++ b/src/mainboard/hp/dl145_g3/get_bus_conf.c @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c index 0939b5801f..1d59021f5b 100644 --- a/src/mainboard/hp/dl145_g3/mptable.c +++ b/src/mainboard/hp/dl145_g3/mptable.c @@ -34,7 +34,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/iwill/dk8_htx/get_bus_conf.c b/src/mainboard/iwill/dk8_htx/get_bus_conf.c index 6fad3a3db9..45a77cc858 100644 --- a/src/mainboard/iwill/dk8_htx/get_bus_conf.c +++ b/src/mainboard/iwill/dk8_htx/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/iwill/dk8_htx/mptable.c b/src/mainboard/iwill/dk8_htx/mptable.c index e8d3104741..abf80794d3 100644 --- a/src/mainboard/iwill/dk8_htx/mptable.c +++ b/src/mainboard/iwill/dk8_htx/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/kontron/kt690/get_bus_conf.c b/src/mainboard/kontron/kt690/get_bus_conf.c index 90c98a3ac7..79020b3faf 100644 --- a/src/mainboard/kontron/kt690/get_bus_conf.c +++ b/src/mainboard/kontron/kt690/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/msi/ms7135/get_bus_conf.c b/src/mainboard/msi/ms7135/get_bus_conf.c index a63c803b8e..04b0ccdf87 100644 --- a/src/mainboard/msi/ms7135/get_bus_conf.c +++ b/src/mainboard/msi/ms7135/get_bus_conf.c @@ -28,7 +28,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS == 1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/msi/ms7260/get_bus_conf.c b/src/mainboard/msi/ms7260/get_bus_conf.c index 749be0e33d..cfbc125299 100644 --- a/src/mainboard/msi/ms7260/get_bus_conf.c +++ b/src/mainboard/msi/ms7260/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> #include <stdlib.h> diff --git a/src/mainboard/msi/ms9185/get_bus_conf.c b/src/mainboard/msi/ms9185/get_bus_conf.c index c4f086a76a..b6718a4323 100644 --- a/src/mainboard/msi/ms9185/get_bus_conf.c +++ b/src/mainboard/msi/ms9185/get_bus_conf.c @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/msi/ms9185/mptable.c b/src/mainboard/msi/ms9185/mptable.c index 6bfaf5c131..d40db7bda3 100644 --- a/src/mainboard/msi/ms9185/mptable.c +++ b/src/mainboard/msi/ms9185/mptable.c @@ -31,7 +31,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/msi/ms9282/get_bus_conf.c b/src/mainboard/msi/ms9282/get_bus_conf.c index 276cef5461..f2b9f5932a 100644 --- a/src/mainboard/msi/ms9282/get_bus_conf.c +++ b/src/mainboard/msi/ms9282/get_bus_conf.c @@ -28,7 +28,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c index fc7feafb03..c5f9083392 100644 --- a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c +++ b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c index 0c49642bcd..2c08e1749f 100644 --- a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c +++ b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/sunw/ultra40/get_bus_conf.c b/src/mainboard/sunw/ultra40/get_bus_conf.c index 6271130961..a05897ec6b 100644 --- a/src/mainboard/sunw/ultra40/get_bus_conf.c +++ b/src/mainboard/sunw/ultra40/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <stdlib.h> diff --git a/src/mainboard/supermicro/h8dme/get_bus_conf.c b/src/mainboard/supermicro/h8dme/get_bus_conf.c index 8954829b68..98e98bef30 100644 --- a/src/mainboard/supermicro/h8dme/get_bus_conf.c +++ b/src/mainboard/supermicro/h8dme/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/supermicro/h8dmr/get_bus_conf.c b/src/mainboard/supermicro/h8dmr/get_bus_conf.c index 8954829b68..98e98bef30 100644 --- a/src/mainboard/supermicro/h8dmr/get_bus_conf.c +++ b/src/mainboard/supermicro/h8dmr/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c index 6604efff22..20d31813b0 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c +++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/technexion/tim5690/get_bus_conf.c b/src/mainboard/technexion/tim5690/get_bus_conf.c index 90c98a3ac7..79020b3faf 100644 --- a/src/mainboard/technexion/tim5690/get_bus_conf.c +++ b/src/mainboard/technexion/tim5690/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/technexion/tim8690/get_bus_conf.c b/src/mainboard/technexion/tim8690/get_bus_conf.c index 90c98a3ac7..79020b3faf 100644 --- a/src/mainboard/technexion/tim8690/get_bus_conf.c +++ b/src/mainboard/technexion/tim8690/get_bus_conf.c @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2850/mptable.c b/src/mainboard/tyan/s2850/mptable.c index f7fb1f3c50..051e9fd487 100644 --- a/src/mainboard/tyan/s2850/mptable.c +++ b/src/mainboard/tyan/s2850/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif diff --git a/src/mainboard/tyan/s2875/mptable.c b/src/mainboard/tyan/s2875/mptable.c index c6f109db5c..f29a728759 100644 --- a/src/mainboard/tyan/s2875/mptable.c +++ b/src/mainboard/tyan/s2875/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif static unsigned node_link_to_bus(unsigned node, unsigned link) diff --git a/src/mainboard/tyan/s2880/mptable.c b/src/mainboard/tyan/s2880/mptable.c index 0921fdccfe..b8e17ecf02 100644 --- a/src/mainboard/tyan/s2880/mptable.c +++ b/src/mainboard/tyan/s2880/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif diff --git a/src/mainboard/tyan/s2881/get_bus_conf.c b/src/mainboard/tyan/s2881/get_bus_conf.c index 063515c27f..7044f8ec5f 100644 --- a/src/mainboard/tyan/s2881/get_bus_conf.c +++ b/src/mainboard/tyan/s2881/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2882/mptable.c b/src/mainboard/tyan/s2882/mptable.c index 63d47f8372..b2858fcc84 100644 --- a/src/mainboard/tyan/s2882/mptable.c +++ b/src/mainboard/tyan/s2882/mptable.c @@ -5,7 +5,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif diff --git a/src/mainboard/tyan/s2885/get_bus_conf.c b/src/mainboard/tyan/s2885/get_bus_conf.c index 22a5b760db..fd5d936ee3 100644 --- a/src/mainboard/tyan/s2885/get_bus_conf.c +++ b/src/mainboard/tyan/s2885/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2891/get_bus_conf.c b/src/mainboard/tyan/s2891/get_bus_conf.c index 31afeb0f86..e2ebe4df1e 100644 --- a/src/mainboard/tyan/s2891/get_bus_conf.c +++ b/src/mainboard/tyan/s2891/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2892/get_bus_conf.c b/src/mainboard/tyan/s2892/get_bus_conf.c index 1a91b05822..dd5e219741 100644 --- a/src/mainboard/tyan/s2892/get_bus_conf.c +++ b/src/mainboard/tyan/s2892/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2895/get_bus_conf.c b/src/mainboard/tyan/s2895/get_bus_conf.c index cf918f0e9c..d36a76d181 100644 --- a/src/mainboard/tyan/s2895/get_bus_conf.c +++ b/src/mainboard/tyan/s2895/get_bus_conf.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2912/get_bus_conf.c b/src/mainboard/tyan/s2912/get_bus_conf.c index 40a1cc7718..39769622a6 100644 --- a/src/mainboard/tyan/s2912/get_bus_conf.c +++ b/src/mainboard/tyan/s2912/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c index e2f721bace..5a82b4ce69 100644 --- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c +++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/tyan/s4880/mptable.c b/src/mainboard/tyan/s4880/mptable.c index 2d1e459579..d90f783588 100644 --- a/src/mainboard/tyan/s4880/mptable.c +++ b/src/mainboard/tyan/s4880/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif static unsigned node_link_to_bus(unsigned node, unsigned link) diff --git a/src/mainboard/tyan/s4882/mptable.c b/src/mainboard/tyan/s4882/mptable.c index 6b13821f47..965e6ae306 100644 --- a/src/mainboard/tyan/s4882/mptable.c +++ b/src/mainboard/tyan/s4882/mptable.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 765bd0b7c9..535501d15f 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -32,7 +32,7 @@ #include <cpu/x86/lapic.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #include <pc80/mc146818rtc.h> #endif diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index 4cca32ac8a..5500ce65a7 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -19,7 +19,7 @@ #include <cpu/x86/lapic.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #if CONFIG_LOGICAL_CPUS==1 #include <pc80/mc146818rtc.h> #endif |