From 1db4e3a3588a8cca317e73df52e11da8d2da57ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Thu, 3 Jan 2019 11:38:33 +0200
Subject: amdfam10 boards: Declare get_pci1234() just once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I68bb9c4301c846fe2270cd7c434f35a79ab25572
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30627
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/include/cpu/amd/amdfam10_sysconf.h                   | 3 ++-
 src/mainboard/advansus/a785e-i/get_bus_conf.c            | 2 --
 src/mainboard/amd/bimini_fam10/get_bus_conf.c            | 2 --
 src/mainboard/amd/mahogany_fam10/get_bus_conf.c          | 2 --
 src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c | 2 --
 src/mainboard/amd/tilapia_fam10/get_bus_conf.c           | 2 --
 src/mainboard/asus/kcma-d8/get_bus_conf.c                | 2 --
 src/mainboard/asus/kfsn4-dre/get_bus_conf.c              | 2 --
 src/mainboard/asus/kgpe-d16/get_bus_conf.c               | 2 --
 src/mainboard/asus/m4a78-em/get_bus_conf.c               | 2 --
 src/mainboard/asus/m4a785-m/get_bus_conf.c               | 2 --
 src/mainboard/asus/m5a88-v/get_bus_conf.c                | 2 --
 src/mainboard/avalue/eax-785e/get_bus_conf.c             | 2 --
 src/mainboard/gigabyte/ma785gm/get_bus_conf.c            | 2 --
 src/mainboard/gigabyte/ma785gmt/get_bus_conf.c           | 2 --
 src/mainboard/gigabyte/ma78gm/get_bus_conf.c             | 2 --
 src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c           | 2 --
 src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c       | 2 --
 src/mainboard/jetway/pa78vm5/get_bus_conf.c              | 2 --
 src/mainboard/msi/ms9652_fam10/get_bus_conf.c            | 2 --
 src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c      | 2 --
 src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c      | 2 --
 src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c      | 2 --
 src/mainboard/tyan/s2912_fam10/get_bus_conf.c            | 2 --
 src/northbridge/amd/amdfam10/northbridge.h               | 1 -
 25 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/include/cpu/amd/amdfam10_sysconf.h b/src/include/cpu/amd/amdfam10_sysconf.h
index a60dae3c99..aa35c714b6 100644
--- a/src/include/cpu/amd/amdfam10_sysconf.h
+++ b/src/include/cpu/amd/amdfam10_sysconf.h
@@ -66,6 +66,7 @@ struct amdfam10_sysconf_t {
 
 extern struct amdfam10_sysconf_t sysconf;
 
-void get_sblk_pci1234(void);
 void get_bus_conf(void);
+void get_pci1234(void);
+
 #endif
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index 65175f98dc..28de27671b 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -49,8 +49,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb800;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index 8ad6730196..0173ef02b1 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -49,8 +49,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb800;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
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 5fc708df31..2a83d43a61 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -57,8 +57,6 @@ static unsigned hcdnx[] = {
 
 
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 static u32 get_hcid(u32 i)
diff --git a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index 62b726cc82..73599fb2d2 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -51,8 +51,6 @@ u32 hcdnx[] = {
 u32 sbdn_sr5650;
 u32 sbdn_sp5100;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index c8bf9a8728..180f6292c7 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -60,8 +60,6 @@ static unsigned hcdnx[] = {
 	0x20202020, 0x20202020,
 };
 
-extern void get_pci1234(void);
-
 static unsigned get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index 62b726cc82..73599fb2d2 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -51,8 +51,6 @@ u32 hcdnx[] = {
 u32 sbdn_sr5650;
 u32 sbdn_sp5100;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index 92b4084867..41dfe37f46 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -49,8 +49,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb800;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index 92b4084867..41dfe37f46 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -49,8 +49,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb800;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
index c43509ccbd..65a4d8582d 100644
--- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
+++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
@@ -55,8 +55,6 @@ static unsigned hcdnx[] = {
 	0x20202020, 0x20202020,
 };
 
-extern void get_pci1234(void);
-
 static unsigned get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index eca0ba7187..d7ca975a5d 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -48,8 +48,6 @@ u32 hcdnx[] = {
 u32 sbdn_rs780;
 u32 sbdn_sb700;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
index 4f9499b523..887110f717 100644
--- a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
+++ b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
@@ -55,8 +55,6 @@ static unsigned hcdnx[] = {
 	0x20202020, 0x20202020,
 };
 
-extern void get_pci1234(void);
-
 static unsigned get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
index 0982138f68..b122073f1b 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
@@ -55,8 +55,6 @@ static unsigned hcdnx[] = {
 	0x20202020, 0x20202020,
 };
 
-extern void get_pci1234(void);
-
 static unsigned get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
index 280267e018..9643417250 100644
--- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
@@ -57,8 +57,6 @@ static unsigned hcdnx[] = {
 
 unsigned sbdn3;
 
-extern void get_pci1234(void);
-
 static unsigned get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index bab194ff3f..255fd898f9 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -50,8 +50,6 @@ u32 hcdnx[] = {
 u32 sbdn_sr5650;
 u32 sbdn_sp5100;
 
-extern void get_pci1234(void);
-
 static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
index 9f95b6563e..ed3dfb701e 100644
--- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
@@ -55,8 +55,6 @@ static unsigned hcdnx[] = {
 	0x20202020, 0x20202020,
 };
 
-extern void get_pci1234(void);
-
 static unsigned get_bus_conf_done = 0;
 
 void get_bus_conf(void)
diff --git a/src/northbridge/amd/amdfam10/northbridge.h b/src/northbridge/amd/amdfam10/northbridge.h
index 69d7415b22..fdfd4c8c2c 100644
--- a/src/northbridge/amd/amdfam10/northbridge.h
+++ b/src/northbridge/amd/amdfam10/northbridge.h
@@ -17,6 +17,5 @@
 #define NORTHBRIDGE_AMD_AMDFAM10_H
 
 u32 amdfam10_scan_root_bus(struct device *root, u32 max);
-void get_pci1234(void);
 
 #endif /* NORTHBRIDGE_AMD_AMDFAM10_H */
-- 
cgit v1.2.3