dualcore.h and quadcore.h are almost exactly the same.

Only have multicore.h for both of them.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5311 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c
index ac201e4f41d1f40d6689d807bf39b380756a5470..3a56fdd1c3c802105036c6e1647a5bacd0480298 100644 (file)
--- 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 33355cd5586823b8dea984d01a36ca01d546e454..a2b180b2b67630961eb5f448fc042ad9fe654e81 100644 (file)
--- 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 407121d2d8a5e92f2e6e6bde17c6ced89fd2d43f..8aac3e89ec6b09753c07014facf81a044eebee12 100644 (file)
--- 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 47eae695e85cc39bf3e335c3314587efa846f80e..165155f2ed7d7e19618ede0413a5fc7d88c750f7 100644 (file)
--- 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 52f5e63f79bfa2a5a8b5137fb3920ab444bc3c9c..9e4da8b90f18f91996e6cafab2ccd5341eb57b1a 100644 (file)
--- 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 (file)
index 58cf945..0000000
--- 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/multicore.h b/src/include/cpu/amd/multicore.h
new file mode 100644 (file)
index 0000000..47328ef
--- /dev/null
+++ b/src/include/cpu/amd/multicore.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef CPU_AMD_QUADCORE_H
+#define CPU_AMD_QUADCORE_H
+
+#if defined(__GNUC__)
+u32 read_nb_cfg_54(void);
+#endif
+
+struct node_core_id {
+       u32 nodeid;
+       u32 coreid;
+};
+
+#if defined(__GNUC__)
+// it can be used to get unitid and coreid it running only
+struct node_core_id get_node_core_id(u32 nb_cfg_54);
+#endif
+
+#if !defined(__PRE_RAM__)
+struct device;
+u32 get_apicid_base(u32 ioapic_num);
+void amd_sibling_init(struct device *cpu);
+#endif
+
+#endif /* CPU_AMD_QUADCORE_H */

diff --git a/src/include/cpu/amd/quadcore.h b/src/include/cpu/amd/quadcore.h
deleted file mode 100644 (file)
index 7bf84b4..0000000
--- a/src/include/cpu/amd/quadcore.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef CPU_AMD_QUADCORE_H
-#define CPU_AMD_QUADCORE_H
-
-#if defined(__GNUC__)
-unsigned int read_nb_cfg_54(void);
-#endif
-
-struct node_core_id {
-       u32 nodeid;
-       u32 coreid;
-};
-
-#if defined(__GNUC__)
-// it can be used to get unitid and coreid it running only
-struct node_core_id get_node_core_id(u32 nb_cfg_54);
-#endif
-
-#if !defined(__PRE_RAM__)
-struct device;
-u32 get_apicid_base(u32 ioapic_num);
-void amd_sibling_init(struct device *cpu);
-#endif
-
-#endif /* CPU_AMD_QUADCORE_H */

diff --git a/src/mainboard/amd/dbm690t/get_bus_conf.c b/src/mainboard/amd/dbm690t/get_bus_conf.c
index 90c98a3ac7c6b662c1b2d56dd938566ef62e30c0..79020b3faf73b9e9b2c68880186b034a3997dc7e 100644 (file)
--- 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 25d83d6005b727fb79d361d46820e57874379e83..1c319ec5856b9d3e05cd7ead8f14912fe1ede6ee 100644 (file)
--- 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 f77b4deab2b87fdac45f9e3a35da00011544505b..672f9e9efb497b65db10441fa68c205588e491ee 100644 (file)
--- 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 90c98a3ac7c6b662c1b2d56dd938566ef62e30c0..79020b3faf73b9e9b2c68880186b034a3997dc7e 100644 (file)
--- 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 c7d19adbbb6ae5edad18b3b65269b6c52f980931..c6a929904b20ab5a15b9af323eaa40e5cc94fd22 100644 (file)
--- 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 3e1e9b276e119c354c273ccec9aa7ea07158bd08..0d979b55994d16d789fe62228dda824ed098e0fe 100644 (file)
--- 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 8e3dcf1b84c4955381473952fb8f53ec530c4e3c..72df5ba78dfdb693467c6e4dae73ac41cb6d6d19 100644 (file)
--- 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 962715156068c053ad8ea8fd5b2a8b4302043de2..8a6cfdf97d273346e3b55f1d1a3a635fa25a3c7f 100644 (file)
--- 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 bcc34ffa59acf82c7c875549011408b9c1dde57e..4ce86b51cdba0b046099f00f4fae156068e6ec49 100644 (file)
--- 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 cfe525708071fba14c69e9830ad880fda1f535d1..2d42bcc7d85464cd28f4d8f5bf6d15973f0bf912 100644 (file)
--- 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 313a34a67ca89283113d2b7903214eade08bcc64..74b1a36e1dad427d63da0294c270dced7aa01078 100644 (file)
--- 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 3746918dd30bcb29c75e6df299bc5c62efc31b78..74e7f109c1de66f1ebc19559c2ad45e1be2ee2a7 100644 (file)
--- 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 9e5a1b09a16ce5491fe6c02dd584577541ce65ba..771adf5ebf9f3ef3112479868c2de8c370f11cdb 100644 (file)
--- 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 cace2d1ea0f960c0f7d5962ea8693afd200c1e84..c8090b97d02ac41c69907e70952b6972e07cf879 100644 (file)
--- 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 0939b5801fa1b0f3b9f9dd6b3443245403f0eb6b..1d59021f5b3ab245a04faa6c9c8f69e4f6b0945e 100644 (file)
--- 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 6fad3a3db9eea22520b1dd93eff8b38041f64382..45a77cc858ff31082db09e69b8d696ec778eaff6 100644 (file)
--- 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 e8d3104741fbb15f3ec20d5c6f62af3d34b3671b..abf80794d3166296325aa466f7ef12a6f4566f8f 100644 (file)
--- 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 90c98a3ac7c6b662c1b2d56dd938566ef62e30c0..79020b3faf73b9e9b2c68880186b034a3997dc7e 100644 (file)
--- 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 a63c803b8e20fbab1fea0c00f674d5b53d1bc814..04b0ccdf878784635ce6c85fdf6ef79696b33fe8 100644 (file)
--- 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 749be0e33d30957bb06ab5e7b490c1b5891e962b..cfbc125299a10fc9b7c78c2e310ed5727d47f9a5 100644 (file)
--- 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 c4f086a76ac929ae4c8dae8ac28d41b8ad603af5..b6718a4323d2d6bf5b01a8fad569f6c542b63694 100644 (file)
--- 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 6bfaf5c1316d1682c1eed6bcd79bc991f1abedc7..d40db7bda38776fdb21781717608717453ea9ae0 100644 (file)
--- 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 276cef5461a5c1260cd80c40b293d8bef04b5198..f2b9f5932a962d97ca0b3992f0dc6f766090238c 100644 (file)
--- 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 fc7feafb033f23d89f7da1ba37fb105e4c650fa0..c5f908339200bf662be9d727ad12249ca76b1320 100644 (file)
--- 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 0c49642bcdec5a69ef74f93a3addaac2f8d402e0..2c08e1749ff98a67e548c1dddf9ccd55b34730ce 100644 (file)
--- 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 6271130961a2d68f44b799232d1af89ea9babd15..a05897ec6bb702101ae244e71994b5d5031d16f6 100644 (file)
--- 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 8954829b68293dd821a58c30700874350ff6ef59..98e98bef302507238853737dd629b772c8241760 100644 (file)
--- 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 8954829b68293dd821a58c30700874350ff6ef59..98e98bef302507238853737dd629b772c8241760 100644 (file)
--- 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 6604efff22b051d357e90f0cce8b8df700ee3360..20d31813b074af2c2782a925c94244a99d85e74d 100644 (file)
--- 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 90c98a3ac7c6b662c1b2d56dd938566ef62e30c0..79020b3faf73b9e9b2c68880186b034a3997dc7e 100644 (file)
--- 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 90c98a3ac7c6b662c1b2d56dd938566ef62e30c0..79020b3faf73b9e9b2c68880186b034a3997dc7e 100644 (file)
--- 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 f7fb1f3c50f275e357a8fe4e4eca453e9e8ba625..051e9fd4870f69ecc5fc854f5963698632ee4ed8 100644 (file)
--- 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 c6f109db5cad18c8ad9b38e5a21c84eab7ca84d5..f29a728759e4c1eb56f1a0fe2a6c95539795c1a6 100644 (file)
--- 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 0921fdccfeeeb59dec1549983cdf487abef0603e..b8e17ecf029ae6206b54b5ae00234766b1e2988b 100644 (file)
--- 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 063515c27f47f82606fdb4f0daed0086236ed871..7044f8ec5ff16f50576c21043deda7e88f1819e9 100644 (file)
--- 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 63d47f837225d021fb922aa5174005ff0b29cff6..b2858fcc84655c12a5ee6181c5e3065ef6f8b676 100644 (file)
--- 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 22a5b760dbe56fd91e203923a89c08023b271ec8..fd5d936ee30dd10a702e671373c1eae96168b307 100644 (file)
--- 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 31afeb0f861f4da8520c3386f506703791217e60..e2ebe4df1e5e909a26bb889859be2a6ca4f0ed06 100644 (file)
--- 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 1a91b058229b315f8608a78350aba96d644cf791..dd5e21974153dcd85ef50f86b433cd34c25a8d3a 100644 (file)
--- 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 cf918f0e9c4ffd9b999c2ed2bd2074ce078a9fd2..d36a76d181eca86abd33f652364bffc2399a6150 100644 (file)
--- 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 40a1cc771845255e7883c13ab34fb67790885aa2..39769622a61b63ec83295f7a5752012cbb54b51f 100644 (file)
--- 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 e2f721bacede46521dcdf0bbf4aea93a7fac630b..5a82b4ce6975e76c0b6ae25a02f569c7f9415b74 100644 (file)
--- 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 2d1e45957998e7e95137952d4ae96bb565ba5378..d90f7835882d9981eb5de648d41202ba1b3f4088 100644 (file)
--- 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 6b13821f47146938bb49154cc78588c80e68f60a..965e6ae306ccaaff6c9af1fc9e86985288656610 100644 (file)
--- 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 765bd0b7c9634b02ccec201a8ee1f569d973e339..535501d15f46a32301997060b9f455ba64680a6d 100644 (file)
--- 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 4cca32ac8a78f6aece8e01b54ab5f3e4ee8fc00f..5500ce65a7858dee9cc493482e0c595c20752e29 100644 (file)
--- 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