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

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>

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

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);

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>
 

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

src/include/cpu/amd/dualcore.h

@@ -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 */

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 {

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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
 
 

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)

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
 
 

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>

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
 
 

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>

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>

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>

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>

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>

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>

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)

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
 
 

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
 

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