move amd K8/Fam10 "bus detection" function prototypes to a common place.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5370 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

109 files changed, 111 insertions, 108 deletions

diff --git a/src/include/cpu/amd/amdfam10_sysconf.h b/src/include/cpu/amd/amdfam10_sysconf.h
index 8096246944..c8648611d5 100644
--- a/src/include/cpu/amd/amdfam10_sysconf.h
+++ b/src/include/cpu/amd/amdfam10_sysconf.h
@@ -70,4 +70,6 @@ struct amdfam10_sysconf_t {
 
 extern struct amdfam10_sysconf_t sysconf;
 
+void get_sblk_pci1234(void);
+void get_bus_conf(void);
 #endif
diff --git a/src/include/cpu/amd/amdk8_sysconf.h b/src/include/cpu/amd/amdk8_sysconf.h
index 36c17f1772..28158a6c38 100644
--- a/src/include/cpu/amd/amdk8_sysconf.h
+++ b/src/include/cpu/amd/amdk8_sysconf.h
@@ -25,4 +25,6 @@ struct amdk8_sysconf_t {
 
 extern struct amdk8_sysconf_t sysconf;
 
+void get_sblk_pci1234(void);
+void get_bus_conf(void);
 #endif
diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index a57cb48a4d..d28acc7bc3 100644
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -92,7 +92,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/amd/dbm690t/get_bus_conf.c b/src/mainboard/amd/dbm690t/get_bus_conf.c
index 79020b3faf..24b9f28132 100644
--- a/src/mainboard/amd/dbm690t/get_bus_conf.c
+++ b/src/mainboard/amd/dbm690t/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs690;
 u32 sbdn_sb600;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/amd/dbm690t/irq_tables.c b/src/mainboard/amd/dbm690t/irq_tables.c
index 8457745724..e3ec01a5c4 100644
--- a/src/mainboard/amd/dbm690t/irq_tables.c
+++ b/src/mainboard/amd/dbm690t/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/dbm690t/mptable.c b/src/mainboard/amd/dbm690t/mptable.c
index d5610eb12b..0bc73d7440 100644
--- a/src/mainboard/amd/dbm690t/mptable.c
+++ b/src/mainboard/amd/dbm690t/mptable.c
@@ -36,7 +36,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs690;
 extern u32 sbdn_sb600;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c
index 08b15ea046..692b0f2fcf 100644
--- a/src/mainboard/amd/mahogany/acpi_tables.c
+++ b/src/mainboard/amd/mahogany/acpi_tables.c
@@ -99,7 +99,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 #if CONFIG_ACPI_SSDTX_NUM >= 1
 static void update_ssdtx(void *ssdtx, int i)
diff --git a/src/mainboard/amd/mahogany/get_bus_conf.c b/src/mainboard/amd/mahogany/get_bus_conf.c
index 1c319ec585..e3c7acd226 100644
--- a/src/mainboard/amd/mahogany/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/amd/mahogany/irq_tables.c b/src/mainboard/amd/mahogany/irq_tables.c
index 3e54c02676..800a415357 100644
--- a/src/mainboard/amd/mahogany/irq_tables.c
+++ b/src/mainboard/amd/mahogany/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/mahogany/mptable.c b/src/mainboard/amd/mahogany/mptable.c
index 6a922fbc05..89f7a8308b 100644
--- a/src/mainboard/amd/mahogany/mptable.c
+++ b/src/mainboard/amd/mahogany/mptable.c
@@ -37,7 +37,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs780;
 extern u32 sbdn_sb700;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index 7a071fbfda..25ac76f6e3 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -89,7 +89,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 extern void update_ssdt(void *ssdt);
 
 /* not tested yet. */
diff --git a/src/mainboard/amd/mahogany_fam10/irq_tables.c b/src/mainboard/amd/mahogany_fam10/irq_tables.c
index 2ea7de11a2..b6b0ef1941 100644
--- a/src/mainboard/amd/mahogany_fam10/irq_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/irq_tables.c
@@ -25,7 +25,7 @@
 
 #include <cpu/amd/amdfam10_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index 64536066dc..fdf8ada6fb 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -37,7 +37,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs780;
 extern u32 sbdn_sb700;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c
index 5431a1f516..16d1cbbd47 100644
--- a/src/mainboard/amd/pistachio/acpi_tables.c
+++ b/src/mainboard/amd/pistachio/acpi_tables.c
@@ -92,7 +92,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/amd/pistachio/get_bus_conf.c b/src/mainboard/amd/pistachio/get_bus_conf.c
index 79020b3faf..24b9f28132 100644
--- a/src/mainboard/amd/pistachio/get_bus_conf.c
+++ b/src/mainboard/amd/pistachio/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs690;
 u32 sbdn_sb600;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/amd/pistachio/irq_tables.c b/src/mainboard/amd/pistachio/irq_tables.c
index 9e42e53c58..9189bf9fae 100644
--- a/src/mainboard/amd/pistachio/irq_tables.c
+++ b/src/mainboard/amd/pistachio/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/amd/pistachio/mptable.c b/src/mainboard/amd/pistachio/mptable.c
index 12bb3ddac4..ebf4c58cf1 100644
--- a/src/mainboard/amd/pistachio/mptable.c
+++ b/src/mainboard/amd/pistachio/mptable.c
@@ -36,7 +36,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs690;
 extern u32 sbdn_sb600;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index 87382c4e32..c7103f1ad9 100644
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -150,7 +150,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
index c6a929904b..436044e69a 100644
--- a/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c
@@ -39,7 +39,7 @@ static unsigned hcdnx[] =
 //        0x20202020,
 };
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/amd/serengeti_cheetah/irq_tables.c b/src/mainboard/amd/serengeti_cheetah/irq_tables.c
index 7d6f66bb96..d872b0a0db 100644
--- a/src/mainboard/amd/serengeti_cheetah/irq_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/irq_tables.c
@@ -34,7 +34,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 }
 
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c
index 0d979b5599..713dabe34e 100644
--- a/src/mainboard/amd/serengeti_cheetah/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah/mptable.c
@@ -10,7 +10,7 @@
 #include <cpu/amd/amdk8_sysconf.h>
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
index 0ed6daf558..172b6588f7 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
@@ -160,7 +160,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 extern void update_ssdt(void *ssdt);
 
 static void update_ssdtx(void *ssdtx, int i)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
index a2197e37bc..125c761cf0 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
@@ -46,7 +46,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, u8 lin
 }
 
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index 8a6cfdf97d..381d322d9d 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -29,7 +29,7 @@
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/asrock/939a785gmh/acpi_tables.c b/src/mainboard/asrock/939a785gmh/acpi_tables.c
index 08b15ea046..692b0f2fcf 100644
--- a/src/mainboard/asrock/939a785gmh/acpi_tables.c
+++ b/src/mainboard/asrock/939a785gmh/acpi_tables.c
@@ -99,7 +99,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 #if CONFIG_ACPI_SSDTX_NUM >= 1
 static void update_ssdtx(void *ssdtx, int i)
diff --git a/src/mainboard/asrock/939a785gmh/get_bus_conf.c b/src/mainboard/asrock/939a785gmh/get_bus_conf.c
index 1c319ec585..e3c7acd226 100644
--- a/src/mainboard/asrock/939a785gmh/get_bus_conf.c
+++ b/src/mainboard/asrock/939a785gmh/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/asrock/939a785gmh/irq_tables.c b/src/mainboard/asrock/939a785gmh/irq_tables.c
index 3e54c02676..800a415357 100644
--- a/src/mainboard/asrock/939a785gmh/irq_tables.c
+++ b/src/mainboard/asrock/939a785gmh/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/asrock/939a785gmh/mptable.c b/src/mainboard/asrock/939a785gmh/mptable.c
index 6a922fbc05..89f7a8308b 100644
--- a/src/mainboard/asrock/939a785gmh/mptable.c
+++ b/src/mainboard/asrock/939a785gmh/mptable.c
@@ -37,7 +37,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs780;
 extern u32 sbdn_sb700;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/asus/a8n_e/get_bus_conf.c b/src/mainboard/asus/a8n_e/get_bus_conf.c
index 4ce86b51cd..12c8859208 100644
--- a/src/mainboard/asus/a8n_e/get_bus_conf.c
+++ b/src/mainboard/asus/a8n_e/get_bus_conf.c
@@ -61,7 +61,7 @@ unsigned hcdnx[] = {
 
 unsigned bus_type[256];
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/asus/a8n_e/irq_tables.c b/src/mainboard/asus/a8n_e/irq_tables.c
index a43350b600..0c0d3467a2 100644
--- a/src/mainboard/asus/a8n_e/irq_tables.c
+++ b/src/mainboard/asus/a8n_e/irq_tables.c
@@ -30,7 +30,7 @@
 
 extern unsigned char bus_isa;
 extern unsigned char bus_ck804[6];
-extern void get_bus_conf(void);
+
 
 /**
  * Add one line to IRQ table.
diff --git a/src/mainboard/asus/a8n_e/mptable.c b/src/mainboard/asus/a8n_e/mptable.c
index 8be47f79a2..3a0806b874 100644
--- a/src/mainboard/asus/a8n_e/mptable.c
+++ b/src/mainboard/asus/a8n_e/mptable.c
@@ -32,7 +32,7 @@ extern unsigned char bus_isa;
 extern unsigned char bus_ck804[6];
 extern unsigned apicid_ck804;
 extern unsigned bus_type[256];
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/broadcom/blast/get_bus_conf.c b/src/mainboard/broadcom/blast/get_bus_conf.c
index 2d42bcc7d8..9d1a4b1bf0 100644
--- a/src/mainboard/broadcom/blast/get_bus_conf.c
+++ b/src/mainboard/broadcom/blast/get_bus_conf.c
@@ -46,7 +46,7 @@ unsigned hcdnx[] =
 };
 unsigned sbdn2;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/broadcom/blast/irq_tables.c b/src/mainboard/broadcom/blast/irq_tables.c
index 2dcd9a71b3..3f6f73893e 100644
--- a/src/mainboard/broadcom/blast/irq_tables.c
+++ b/src/mainboard/broadcom/blast/irq_tables.c
@@ -40,7 +40,7 @@ extern  unsigned apicid_bcm5785[3];
 
 extern  unsigned sbdn2;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/broadcom/blast/mptable.c b/src/mainboard/broadcom/blast/mptable.c
index 74b1a36e1d..44bf7f2045 100644
--- a/src/mainboard/broadcom/blast/mptable.c
+++ b/src/mainboard/broadcom/blast/mptable.c
@@ -19,7 +19,7 @@ extern  unsigned apicid_bcm5785[3];
 
 extern  unsigned sbdn2;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
index 74e7f109c1..0b85340948 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
@@ -66,7 +66,7 @@ unsigned hcdnx[] =
 };
 unsigned bus_type[256];
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
index 0b3b407dcb..aa4ef6034e 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
@@ -55,7 +55,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 extern unsigned char bus_isa;
 extern unsigned char bus_sis966[8]; //1
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
@@ -133,7 +133,6 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 			PINTH = IRQ7
 
                         */
-                int	i;
                 uint8_t	reg[8]={0x41,0x42,0x43,0x44,0x60,0x61,0x62,0x63};
 		uint8_t irq[8]={0x0A,0X0B,0X0,0X0a,0X0B,0X05,0X0,0X07};
 
diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c
index 092a4ef741..2f39c6411d 100644
--- a/src/mainboard/gigabyte/m57sli/acpi_tables.c
+++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c
@@ -47,7 +47,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	unsigned int gsi_base = 0x18;
 	extern unsigned char bus_mcp55[8];
 	extern unsigned apicid_mcp55;
-	extern void get_bus_conf(void);
+	
 	unsigned sbdn;
 	struct resource *res;
 	device_t dev;
diff --git a/src/mainboard/gigabyte/m57sli/get_bus_conf.c b/src/mainboard/gigabyte/m57sli/get_bus_conf.c
index 771adf5ebf..4d381a6e8e 100644
--- a/src/mainboard/gigabyte/m57sli/get_bus_conf.c
+++ b/src/mainboard/gigabyte/m57sli/get_bus_conf.c
@@ -64,7 +64,7 @@ unsigned hcdnx[] =
 };
 unsigned bus_type[256]; 
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/gigabyte/m57sli/irq_tables.c b/src/mainboard/gigabyte/m57sli/irq_tables.c
index 284abfe4db..5cb6d8420c 100644
--- a/src/mainboard/gigabyte/m57sli/irq_tables.c
+++ b/src/mainboard/gigabyte/m57sli/irq_tables.c
@@ -53,7 +53,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 extern unsigned char bus_isa;
 extern unsigned char bus_mcp55[8]; //1
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/gigabyte/m57sli/mptable.c b/src/mainboard/gigabyte/m57sli/mptable.c
index ce765c10ca..3c5f5a2a86 100644
--- a/src/mainboard/gigabyte/m57sli/mptable.c
+++ b/src/mainboard/gigabyte/m57sli/mptable.c
@@ -34,7 +34,7 @@ extern unsigned apicid_mcp55;
 
 extern unsigned bus_type[256]; 
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/hp/dl145_g3/get_bus_conf.c b/src/mainboard/hp/dl145_g3/get_bus_conf.c
index c8090b97d0..6bb587b6a7 100644
--- a/src/mainboard/hp/dl145_g3/get_bus_conf.c
+++ b/src/mainboard/hp/dl145_g3/get_bus_conf.c
@@ -61,7 +61,7 @@ static unsigned hcdnx[] =
 //	0x20202020,
 };
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c
index 1d59021f5b..9f52466b6a 100644
--- a/src/mainboard/hp/dl145_g3/mptable.c
+++ b/src/mainboard/hp/dl145_g3/mptable.c
@@ -41,7 +41,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c
index b8209a8c68..e8d1231774 100644
--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -157,7 +157,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/iwill/dk8_htx/get_bus_conf.c b/src/mainboard/iwill/dk8_htx/get_bus_conf.c
index 45a77cc858..d6141158ac 100644
--- a/src/mainboard/iwill/dk8_htx/get_bus_conf.c
+++ b/src/mainboard/iwill/dk8_htx/get_bus_conf.c
@@ -39,7 +39,7 @@ static unsigned hcdnx[] =
 //        0x20202020,
 };
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/iwill/dk8_htx/irq_tables.c b/src/mainboard/iwill/dk8_htx/irq_tables.c
index 7d6f66bb96..d872b0a0db 100644
--- a/src/mainboard/iwill/dk8_htx/irq_tables.c
+++ b/src/mainboard/iwill/dk8_htx/irq_tables.c
@@ -34,7 +34,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 }
 
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/iwill/dk8_htx/mptable.c b/src/mainboard/iwill/dk8_htx/mptable.c
index abf80794d3..c9f7092862 100644
--- a/src/mainboard/iwill/dk8_htx/mptable.c
+++ b/src/mainboard/iwill/dk8_htx/mptable.c
@@ -10,7 +10,7 @@
 #include <cpu/amd/amdk8_sysconf.h>
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c
index 44bc116210..7be5e990bc 100644
--- a/src/mainboard/kontron/kt690/acpi_tables.c
+++ b/src/mainboard/kontron/kt690/acpi_tables.c
@@ -92,7 +92,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/kontron/kt690/get_bus_conf.c b/src/mainboard/kontron/kt690/get_bus_conf.c
index 79020b3faf..24b9f28132 100644
--- a/src/mainboard/kontron/kt690/get_bus_conf.c
+++ b/src/mainboard/kontron/kt690/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs690;
 u32 sbdn_sb600;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/kontron/kt690/irq_tables.c b/src/mainboard/kontron/kt690/irq_tables.c
index 8457745724..e3ec01a5c4 100644
--- a/src/mainboard/kontron/kt690/irq_tables.c
+++ b/src/mainboard/kontron/kt690/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c
index d84f31f0c0..b886c1ebd3 100644
--- a/src/mainboard/kontron/kt690/mptable.c
+++ b/src/mainboard/kontron/kt690/mptable.c
@@ -36,7 +36,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs690;
 extern u32 sbdn_sb600;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/msi/ms7135/get_bus_conf.c b/src/mainboard/msi/ms7135/get_bus_conf.c
index 04b0ccdf87..ae7a7f1a03 100644
--- a/src/mainboard/msi/ms7135/get_bus_conf.c
+++ b/src/mainboard/msi/ms7135/get_bus_conf.c
@@ -51,7 +51,7 @@ unsigned hcdnx[] = {		//HT Chain device num, actually it is unit id base of ever
 };
 unsigned bus_type[256];
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/msi/ms7135/irq_tables.c b/src/mainboard/msi/ms7135/irq_tables.c
index d870eb236d..2f213adab0 100644
--- a/src/mainboard/msi/ms7135/irq_tables.c
+++ b/src/mainboard/msi/ms7135/irq_tables.c
@@ -37,7 +37,7 @@
 
 extern unsigned char bus_isa;
 extern unsigned char bus_ck804[6];
-extern void get_bus_conf(void);
+
 
 /**
  * Add one line to IRQ table.
diff --git a/src/mainboard/msi/ms7135/mptable.c b/src/mainboard/msi/ms7135/mptable.c
index 79d08e14f6..ec318c6066 100644
--- a/src/mainboard/msi/ms7135/mptable.c
+++ b/src/mainboard/msi/ms7135/mptable.c
@@ -36,7 +36,7 @@ extern unsigned apicid_ck804;
 
 extern unsigned bus_type[256];
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/msi/ms7260/get_bus_conf.c b/src/mainboard/msi/ms7260/get_bus_conf.c
index cfbc125299..6f4e198785 100644
--- a/src/mainboard/msi/ms7260/get_bus_conf.c
+++ b/src/mainboard/msi/ms7260/get_bus_conf.c
@@ -67,7 +67,7 @@ unsigned hcdnx[] = {
 
 unsigned bus_type[256];
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/msi/ms7260/irq_tables.c b/src/mainboard/msi/ms7260/irq_tables.c
index f930b9eddb..345b0fac29 100644
--- a/src/mainboard/msi/ms7260/irq_tables.c
+++ b/src/mainboard/msi/ms7260/irq_tables.c
@@ -49,7 +49,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus,
 extern unsigned char bus_isa;
 extern unsigned char bus_mcp55[8];	// 1
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/msi/ms7260/mptable.c b/src/mainboard/msi/ms7260/mptable.c
index 7dad26c852..b6491385f6 100644
--- a/src/mainboard/msi/ms7260/mptable.c
+++ b/src/mainboard/msi/ms7260/mptable.c
@@ -31,7 +31,7 @@ extern unsigned char bus_mcp55[8];	// 1
 extern unsigned apicid_mcp55;
 extern unsigned bus_type[256];
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/msi/ms9185/get_bus_conf.c b/src/mainboard/msi/ms9185/get_bus_conf.c
index b6718a4323..a94acdeb19 100644
--- a/src/mainboard/msi/ms9185/get_bus_conf.c
+++ b/src/mainboard/msi/ms9185/get_bus_conf.c
@@ -62,7 +62,7 @@ static unsigned hcdnx[] =
 //        0x20202020,
 };
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/msi/ms9185/irq_tables.c b/src/mainboard/msi/ms9185/irq_tables.c
index 64832d6f87..b5d74d2392 100644
--- a/src/mainboard/msi/ms9185/irq_tables.c
+++ b/src/mainboard/msi/ms9185/irq_tables.c
@@ -58,7 +58,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
        pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/msi/ms9185/mptable.c b/src/mainboard/msi/ms9185/mptable.c
index 5ec6f30459..838cfc3eed 100644
--- a/src/mainboard/msi/ms9185/mptable.c
+++ b/src/mainboard/msi/ms9185/mptable.c
@@ -38,7 +38,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/msi/ms9282/get_bus_conf.c b/src/mainboard/msi/ms9282/get_bus_conf.c
index a1326b84dd..5b4ee487c1 100644
--- a/src/mainboard/msi/ms9282/get_bus_conf.c
+++ b/src/mainboard/msi/ms9282/get_bus_conf.c
@@ -64,7 +64,7 @@ unsigned hcdnx[] =
 };
 
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/msi/ms9282/irq_tables.c b/src/mainboard/msi/ms9282/irq_tables.c
index aedeab8c20..dbd68f081f 100644
--- a/src/mainboard/msi/ms9282/irq_tables.c
+++ b/src/mainboard/msi/ms9282/irq_tables.c
@@ -55,7 +55,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
         pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/msi/ms9282/mptable.c b/src/mainboard/msi/ms9282/mptable.c
index f8a3195614..baa71c1302 100644
--- a/src/mainboard/msi/ms9282/mptable.c
+++ b/src/mainboard/msi/ms9282/mptable.c
@@ -32,7 +32,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index 63812bdc34..a387408e1b 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -49,7 +49,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	struct mb_sysconf_t *m;
 	//extern unsigned char bus_mcp55[8];
 	//extern unsigned apicid_mcp55;
-	extern void get_bus_conf(void);
+	
 	unsigned sbdn;
 	struct resource *res;
 	device_t dev;
diff --git a/src/mainboard/msi/ms9652_fam10/irq_tables.c b/src/mainboard/msi/ms9652_fam10/irq_tables.c
index d888c836e4..bb14f3310b 100644
--- a/src/mainboard/msi/ms9652_fam10/irq_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/irq_tables.c
@@ -52,7 +52,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 	pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index 89ab4cf82d..c0a7e6e2ce 100644
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -29,7 +29,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
index 2c08e1749f..838373ace3 100644
--- a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
+++ b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
@@ -61,7 +61,7 @@ unsigned hcdnx[] =
 };
 
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/nvidia/l1_2pvv/irq_tables.c b/src/mainboard/nvidia/l1_2pvv/irq_tables.c
index 28c597b9bd..45eed41361 100644
--- a/src/mainboard/nvidia/l1_2pvv/irq_tables.c
+++ b/src/mainboard/nvidia/l1_2pvv/irq_tables.c
@@ -52,7 +52,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 	pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/nvidia/l1_2pvv/mptable.c b/src/mainboard/nvidia/l1_2pvv/mptable.c
index bdc2c43853..0e37ebfb1c 100644
--- a/src/mainboard/nvidia/l1_2pvv/mptable.c
+++ b/src/mainboard/nvidia/l1_2pvv/mptable.c
@@ -29,7 +29,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/sunw/ultra40/get_bus_conf.c b/src/mainboard/sunw/ultra40/get_bus_conf.c
index a05897ec6b..2860ff496a 100644
--- a/src/mainboard/sunw/ultra40/get_bus_conf.c
+++ b/src/mainboard/sunw/ultra40/get_bus_conf.c
@@ -61,7 +61,7 @@ unsigned hcdn[] =
 unsigned sbdn3;
 unsigned sbdnb;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/sunw/ultra40/irq_tables.c b/src/mainboard/sunw/ultra40/irq_tables.c
index 279504b0e1..10ecb4e27a 100644
--- a/src/mainboard/sunw/ultra40/irq_tables.c
+++ b/src/mainboard/sunw/ultra40/irq_tables.c
@@ -51,7 +51,7 @@ extern  unsigned hcdn[];
 extern  unsigned sbdn3;
 extern  unsigned sbdnb;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/sunw/ultra40/mptable.c b/src/mainboard/sunw/ultra40/mptable.c
index 662b6b7e1c..900e466050 100644
--- a/src/mainboard/sunw/ultra40/mptable.c
+++ b/src/mainboard/sunw/ultra40/mptable.c
@@ -32,7 +32,7 @@ extern  unsigned hcdn[];
 extern  unsigned sbdn3;
 extern  unsigned sbdnb;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/supermicro/h8dme/get_bus_conf.c b/src/mainboard/supermicro/h8dme/get_bus_conf.c
index 98e98bef30..3a9218ba6c 100644
--- a/src/mainboard/supermicro/h8dme/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dme/get_bus_conf.c
@@ -65,7 +65,7 @@ unsigned hcdnx[] =
 };
 unsigned sbdnb;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/supermicro/h8dme/irq_tables.c b/src/mainboard/supermicro/h8dme/irq_tables.c
index 284abfe4db..5cb6d8420c 100644
--- a/src/mainboard/supermicro/h8dme/irq_tables.c
+++ b/src/mainboard/supermicro/h8dme/irq_tables.c
@@ -53,7 +53,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 extern unsigned char bus_isa;
 extern unsigned char bus_mcp55[8]; //1
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/supermicro/h8dme/mptable.c b/src/mainboard/supermicro/h8dme/mptable.c
index 784a639802..fb19f25dae 100644
--- a/src/mainboard/supermicro/h8dme/mptable.c
+++ b/src/mainboard/supermicro/h8dme/mptable.c
@@ -33,7 +33,7 @@ extern unsigned apicid_mcp55;
 
 extern unsigned char bus_pcix[3]; // under bus_mcp55_2
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/supermicro/h8dmr/get_bus_conf.c b/src/mainboard/supermicro/h8dmr/get_bus_conf.c
index 98e98bef30..3a9218ba6c 100644
--- a/src/mainboard/supermicro/h8dmr/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr/get_bus_conf.c
@@ -65,7 +65,7 @@ unsigned hcdnx[] =
 };
 unsigned sbdnb;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/supermicro/h8dmr/irq_tables.c b/src/mainboard/supermicro/h8dmr/irq_tables.c
index 284abfe4db..5cb6d8420c 100644
--- a/src/mainboard/supermicro/h8dmr/irq_tables.c
+++ b/src/mainboard/supermicro/h8dmr/irq_tables.c
@@ -53,7 +53,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 extern unsigned char bus_isa;
 extern unsigned char bus_mcp55[8]; //1
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/supermicro/h8dmr/mptable.c b/src/mainboard/supermicro/h8dmr/mptable.c
index 784a639802..fb19f25dae 100644
--- a/src/mainboard/supermicro/h8dmr/mptable.c
+++ b/src/mainboard/supermicro/h8dmr/mptable.c
@@ -33,7 +33,7 @@ extern unsigned apicid_mcp55;
 
 extern unsigned char bus_pcix[3]; // under bus_mcp55_2
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
index 3f767ebbb2..673db742fb 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
@@ -52,7 +52,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 	pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index 2301d6f008..5f1918661e 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -29,7 +29,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
index 209e568067..efaf4cb754 100644
--- a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
@@ -52,7 +52,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 	pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index 9f264bdaa0..ca9512390d 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -29,7 +29,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 extern unsigned sbdn3;
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c
index 44bc116210..7be5e990bc 100644
--- a/src/mainboard/technexion/tim5690/acpi_tables.c
+++ b/src/mainboard/technexion/tim5690/acpi_tables.c
@@ -92,7 +92,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/technexion/tim5690/get_bus_conf.c b/src/mainboard/technexion/tim5690/get_bus_conf.c
index 79020b3faf..24b9f28132 100644
--- a/src/mainboard/technexion/tim5690/get_bus_conf.c
+++ b/src/mainboard/technexion/tim5690/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs690;
 u32 sbdn_sb600;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/technexion/tim5690/irq_tables.c b/src/mainboard/technexion/tim5690/irq_tables.c
index 8457745724..e3ec01a5c4 100644
--- a/src/mainboard/technexion/tim5690/irq_tables.c
+++ b/src/mainboard/technexion/tim5690/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/technexion/tim5690/mptable.c b/src/mainboard/technexion/tim5690/mptable.c
index 5e6d465b33..c392979147 100644
--- a/src/mainboard/technexion/tim5690/mptable.c
+++ b/src/mainboard/technexion/tim5690/mptable.c
@@ -36,7 +36,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs690;
 extern u32 sbdn_sb600;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c
index 44bc116210..7be5e990bc 100644
--- a/src/mainboard/technexion/tim8690/acpi_tables.c
+++ b/src/mainboard/technexion/tim8690/acpi_tables.c
@@ -92,7 +92,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-extern void get_bus_conf(void);
+
 
 static void update_ssdtx(void *ssdtx, int i)
 {
diff --git a/src/mainboard/technexion/tim8690/get_bus_conf.c b/src/mainboard/technexion/tim8690/get_bus_conf.c
index 79020b3faf..24b9f28132 100644
--- a/src/mainboard/technexion/tim8690/get_bus_conf.c
+++ b/src/mainboard/technexion/tim8690/get_bus_conf.c
@@ -59,7 +59,7 @@ u32 bus_type[256];
 u32 sbdn_rs690;
 u32 sbdn_sb600;
 
-extern void get_sblk_pci1234(void);
+
 
 static u32 get_bus_conf_done = 0;
 
diff --git a/src/mainboard/technexion/tim8690/irq_tables.c b/src/mainboard/technexion/tim8690/irq_tables.c
index 8457745724..e3ec01a5c4 100644
--- a/src/mainboard/technexion/tim8690/irq_tables.c
+++ b/src/mainboard/technexion/tim8690/irq_tables.c
@@ -31,7 +31,7 @@
 
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern void get_bus_conf(void);
+
 
 static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 			    u8 link0, u16 bitmap0, u8 link1, u16 bitmap1,
diff --git a/src/mainboard/technexion/tim8690/mptable.c b/src/mainboard/technexion/tim8690/mptable.c
index 8214ff0c2c..1f9e7d343e 100644
--- a/src/mainboard/technexion/tim8690/mptable.c
+++ b/src/mainboard/technexion/tim8690/mptable.c
@@ -36,7 +36,7 @@ extern u32 bus_type[256];
 extern u32 sbdn_rs690;
 extern u32 sbdn_sb600;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s2881/get_bus_conf.c b/src/mainboard/tyan/s2881/get_bus_conf.c
index 7044f8ec5f..758e3d809d 100644
--- a/src/mainboard/tyan/s2881/get_bus_conf.c
+++ b/src/mainboard/tyan/s2881/get_bus_conf.c
@@ -48,7 +48,7 @@ unsigned hcdnx[] =
 };
 unsigned sbdn3;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/tyan/s2881/irq_tables.c b/src/mainboard/tyan/s2881/irq_tables.c
index f41350eca7..af66ba9730 100644
--- a/src/mainboard/tyan/s2881/irq_tables.c
+++ b/src/mainboard/tyan/s2881/irq_tables.c
@@ -38,7 +38,7 @@ extern  unsigned char bus_8111_1;
 
 extern  unsigned sbdn3;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2881/mptable.c b/src/mainboard/tyan/s2881/mptable.c
index c00bc3fedc..4dffcfe8eb 100644
--- a/src/mainboard/tyan/s2881/mptable.c
+++ b/src/mainboard/tyan/s2881/mptable.c
@@ -18,7 +18,7 @@ extern  unsigned apicid_8131_2;
 
 extern  unsigned sbdn3;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s2885/get_bus_conf.c b/src/mainboard/tyan/s2885/get_bus_conf.c
index fd5d936ee3..de4deb23d3 100644
--- a/src/mainboard/tyan/s2885/get_bus_conf.c
+++ b/src/mainboard/tyan/s2885/get_bus_conf.c
@@ -50,7 +50,7 @@ unsigned hcdnx[] =
 unsigned sbdn3;
 unsigned sbdn5;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/tyan/s2885/irq_tables.c b/src/mainboard/tyan/s2885/irq_tables.c
index 1f0a9fb883..f9a358e125 100644
--- a/src/mainboard/tyan/s2885/irq_tables.c
+++ b/src/mainboard/tyan/s2885/irq_tables.c
@@ -41,7 +41,7 @@ extern  unsigned char bus_8151_1;
 extern  unsigned sbdn3;
 extern  unsigned sbdn5;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2885/mptable.c b/src/mainboard/tyan/s2885/mptable.c
index a3e5155d5f..4f5bab5cf4 100644
--- a/src/mainboard/tyan/s2885/mptable.c
+++ b/src/mainboard/tyan/s2885/mptable.c
@@ -21,7 +21,7 @@ extern  unsigned apicid_8131_2;
 extern  unsigned sbdn3;
 extern  unsigned sbdn5;
 
-extern void get_bus_conf(void);
+
 
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/tyan/s2891/get_bus_conf.c b/src/mainboard/tyan/s2891/get_bus_conf.c
index e2ebe4df1e..2bd6954389 100644
--- a/src/mainboard/tyan/s2891/get_bus_conf.c
+++ b/src/mainboard/tyan/s2891/get_bus_conf.c
@@ -55,7 +55,7 @@ unsigned hcdnx[] =
 unsigned sbdn3;
 unsigned coprocdn;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/tyan/s2891/irq_tables.c b/src/mainboard/tyan/s2891/irq_tables.c
index 2b1f640921..cd40c999f7 100644
--- a/src/mainboard/tyan/s2891/irq_tables.c
+++ b/src/mainboard/tyan/s2891/irq_tables.c
@@ -45,7 +45,7 @@ extern  unsigned char bus_coproc_0;
 extern  unsigned sbdn3;
 extern  unsigned coprocdn;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2891/mptable.c b/src/mainboard/tyan/s2891/mptable.c
index d4dc7bcf88..5ebbda039f 100644
--- a/src/mainboard/tyan/s2891/mptable.c
+++ b/src/mainboard/tyan/s2891/mptable.c
@@ -22,7 +22,7 @@ extern  unsigned apicid_8131_2;
 
 extern  unsigned sbdn3;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s2892/get_bus_conf.c b/src/mainboard/tyan/s2892/get_bus_conf.c
index dd5e219741..cadf9d953f 100644
--- a/src/mainboard/tyan/s2892/get_bus_conf.c
+++ b/src/mainboard/tyan/s2892/get_bus_conf.c
@@ -52,7 +52,7 @@ unsigned hcdnx[] =
 
 unsigned sbdn3;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/tyan/s2892/irq_tables.c b/src/mainboard/tyan/s2892/irq_tables.c
index f76afc2fbb..dbe15efded 100644
--- a/src/mainboard/tyan/s2892/irq_tables.c
+++ b/src/mainboard/tyan/s2892/irq_tables.c
@@ -43,7 +43,7 @@ extern  unsigned char bus_8131_2;  //9
 
 extern  unsigned sbdn3;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2892/mptable.c b/src/mainboard/tyan/s2892/mptable.c
index 1aff4c80ae..38ffaabfbd 100644
--- a/src/mainboard/tyan/s2892/mptable.c
+++ b/src/mainboard/tyan/s2892/mptable.c
@@ -22,7 +22,7 @@ extern  unsigned apicid_8131_2;
 
 extern  unsigned sbdn3;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s2895/get_bus_conf.c b/src/mainboard/tyan/s2895/get_bus_conf.c
index d36a76d181..ef5963e39e 100644
--- a/src/mainboard/tyan/s2895/get_bus_conf.c
+++ b/src/mainboard/tyan/s2895/get_bus_conf.c
@@ -60,7 +60,7 @@ unsigned hcdnx[] =
 unsigned sbdn3;
 unsigned sbdnb;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/tyan/s2895/irq_tables.c b/src/mainboard/tyan/s2895/irq_tables.c
index 414084c64a..95df425caa 100644
--- a/src/mainboard/tyan/s2895/irq_tables.c
+++ b/src/mainboard/tyan/s2895/irq_tables.c
@@ -50,7 +50,7 @@ extern  unsigned char bus_ck804b_5;//f
 extern  unsigned sbdn3;
 extern  unsigned sbdnb;
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2895/mptable.c b/src/mainboard/tyan/s2895/mptable.c
index 46f28003fe..600b0f4533 100644
--- a/src/mainboard/tyan/s2895/mptable.c
+++ b/src/mainboard/tyan/s2895/mptable.c
@@ -30,7 +30,7 @@ extern  unsigned apicid_ck804b;
 extern  unsigned sbdn3;
 extern  unsigned sbdnb;
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s2912/get_bus_conf.c b/src/mainboard/tyan/s2912/get_bus_conf.c
index 39769622a6..cd993a7a85 100644
--- a/src/mainboard/tyan/s2912/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912/get_bus_conf.c
@@ -61,7 +61,7 @@ unsigned hcdnx[] =
 };
 
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
diff --git a/src/mainboard/tyan/s2912/irq_tables.c b/src/mainboard/tyan/s2912/irq_tables.c
index 15c6f43452..2c306e4eb5 100644
--- a/src/mainboard/tyan/s2912/irq_tables.c
+++ b/src/mainboard/tyan/s2912/irq_tables.c
@@ -52,7 +52,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 	pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2912/mptable.c b/src/mainboard/tyan/s2912/mptable.c
index bdd029f7aa..027873dfbc 100644
--- a/src/mainboard/tyan/s2912/mptable.c
+++ b/src/mainboard/tyan/s2912/mptable.c
@@ -29,7 +29,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/tyan/s2912_fam10/irq_tables.c b/src/mainboard/tyan/s2912_fam10/irq_tables.c
index d888c836e4..bb14f3310b 100644
--- a/src/mainboard/tyan/s2912_fam10/irq_tables.c
+++ b/src/mainboard/tyan/s2912_fam10/irq_tables.c
@@ -52,7 +52,7 @@ static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t dev
 	pirq_info->rfu = rfu;
 }
 
-extern void get_bus_conf(void);
+
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index 1fe5bea1eb..c2c5f66d7a 100644
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -29,7 +29,7 @@
 
 #include "mb_sysconf.h"
 
-extern void get_bus_conf(void);
+
 
 static void *smp_write_config_table(void *v)
 {