[coreboot-gerrit] Change in ...coreboot[master]: amdfam10 boards: Drop extern on apicid_sp5100

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30780

Change subject: amdfam10 boards: Drop extern on apicid_sp5100
......................................................................

amdfam10 boards: Drop extern on apicid_sp5100

The value get_bus_conf() initialises this value to is
discarded.

Change-Id: I8382861574e6f8ab52839169502a5af7c3742daa
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/asus/kcma-d8/get_bus_conf.c
M src/mainboard/asus/kcma-d8/mptable.c
M src/mainboard/asus/kgpe-d16/get_bus_conf.c
M src/mainboard/asus/kgpe-d16/mptable.c
M src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
M src/mainboard/supermicro/h8scm_fam10/mptable.c
6 files changed, 3 insertions(+), 48 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/30780/1

diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index 3a9eb9e..30be038 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -22,12 +22,6 @@

#include <cpu/amd/amdfam10_sysconf.h>

-/* Global variables for MB layouts and these will be shared by irqtable mptable
-* and acpi_tables busnum is default.
-*/
-u32 apicid_sp5100;
-
-
 void get_bus_conf(void)
 {
    u32 apicid_base;
@@ -36,11 +30,4 @@
    sysconf.sbdn = (sysconf.hcdn[0] & 0xff);

pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
-
-	/* I/O APICs:   APIC ID Version State   Address */
-	if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
-		apicid_base = get_apicid_base(1);
-	else
-		apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
-	apicid_sp5100 = apicid_base + 0;
 }
diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index 54cf5ed..22dbd1a 100644
--- a/src/mainboard/asus/kcma-d8/mptable.c
+++ b/src/mainboard/asus/kcma-d8/mptable.c
@@ -21,14 +21,11 @@
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>

-extern u32 apicid_sp5100;
-
-
-
 static void *smp_write_config_table(void *v)
 {
    struct mp_config_table *mc;
    int bus_isa;
+	u32 apicid_sp5100;
    u32 apicid_sr5650;
    struct device *dev;
    uint8_t sp5100_bus_number;
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index 903e7e1..9264720 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -22,26 +22,12 @@

#include <cpu/amd/amdfam10_sysconf.h>

-/* Global variables for MB layouts and these will be shared by irqtable mptable
-* and acpi_tables busnum is default.
-*/
-u32 apicid_sp5100;
-

void get_bus_conf(void)
 {
-	u32 apicid_base;
-
    get_default_pci1234(1);

sysconf.sbdn = (sysconf.hcdn[0] & 0xff);

pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
-
-	/* I/O APICs:   APIC ID Version State   Address */
-	if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
-		apicid_base = get_apicid_base(1);
-	else
-		apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
-	apicid_sp5100 = apicid_base + 0;
 }
diff --git a/src/mainboard/asus/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index 3b7ff52..e91a424 100644
--- a/src/mainboard/asus/kgpe-d16/mptable.c
+++ b/src/mainboard/asus/kgpe-d16/mptable.c
@@ -21,14 +21,11 @@
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>

-extern u32 apicid_sp5100;
-
-
-
 static void *smp_write_config_table(void *v)
 {
    struct mp_config_table *mc;
    int bus_isa;
+	u32 apicid_sp5100;
    u32 apicid_sr5650;
    struct device *dev;
    uint8_t sp5100_bus_number;
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 7153f79..f6ea933 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -25,11 +25,9 @@
 * and acpi_tables busnum is default.
 */
 u8 bus_sr5650[14];
-u32 apicid_sp5100;

void get_bus_conf(void)
 {
-	u32 apicid_base;
    struct device *dev;
    int i;

@@ -54,11 +52,4 @@
    		}
    	}
    }
-
-	/* I/O APICs:   APIC ID Version State   Address */
-	if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
-		apicid_base = get_apicid_base(1);
-	else
-		apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
-	apicid_sp5100 = apicid_base + 0;
 }
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index 22f064a..ca91368 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -22,14 +22,11 @@

extern u8 bus_sr5650[14];

-extern u32 apicid_sp5100;
-
-
-
 static void *smp_write_config_table(void *v)
 {
    struct mp_config_table *mc;
    int bus_isa;
+	u32 apicid_sp5100;
    u32 apicid_sr5650;

mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);