summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-04 05:16:38 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-10 13:40:04 +0000
commit22521ab2e6fca66319b14f293500101e3bfc2f33 (patch)
tree7d6dd71fbb2b64f68441567f418d4b392f2063a6
parent4b2553eea53b0265db6650e1486647fda82f07a3 (diff)
downloadcoreboot-22521ab2e6fca66319b14f293500101e3bfc2f33.tar.xz
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 <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30780 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/mainboard/asus/kcma-d8/get_bus_conf.c15
-rw-r--r--src/mainboard/asus/kcma-d8/mptable.c5
-rw-r--r--src/mainboard/asus/kgpe-d16/get_bus_conf.c14
-rw-r--r--src/mainboard/asus/kgpe-d16/mptable.c5
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c9
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/mptable.c5
6 files changed, 3 insertions, 50 deletions
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index 3a9eb9e346..be7b3001ea 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -22,25 +22,10 @@
#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/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index 54cf5edb69..22dbd1a49d 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 903e7e1e31..926472068f 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 3b7ff52ab7..e91a424264 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 7153f79df2..f6ea9334fc 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 @@ void get_bus_conf(void)
}
}
}
-
- /* 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 22f064a4ed..ca9136879a 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);