summaryrefslogtreecommitdiff
path: root/src/mainboard/amd
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-07-15 14:38:51 +0300
committerRudolf Marek <r.marek@assembler.cz>2014-07-17 21:48:12 +0200
commit53584fa32f18eafa1f71be511f20d388550b918b (patch)
tree51b9e54489035ca3a7bdfedeb2daae7821a8f69e /src/mainboard/amd
parentc4561e24bbdc418e49aa6dbb2689c78a51061ce0 (diff)
downloadcoreboot-53584fa32f18eafa1f71be511f20d388550b918b.tar.xz
AMD get_bus_conf(): Drop bus_type array
Only ever used as lvalue, so no point creating the array. Change-Id: I6699dfae9377a895e9bc4a52579d00ddcfa60a9f Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/6277 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Rudolf Marek <r.marek@assembler.cz>
Diffstat (limited to 'src/mainboard/amd')
-rw-r--r--src/mainboard/amd/bimini_fam10/get_bus_conf.c15
-rw-r--r--src/mainboard/amd/bimini_fam10/mb_sysconf.h1
-rw-r--r--src/mainboard/amd/bimini_fam10/mptable.c1
-rw-r--r--src/mainboard/amd/dinar/get_bus_conf.c13
-rw-r--r--src/mainboard/amd/dinar/mptable.c1
-rw-r--r--src/mainboard/amd/inagua/get_bus_conf.c13
-rw-r--r--src/mainboard/amd/inagua/mptable.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/mb_sysconf.h1
-rw-r--r--src/mainboard/amd/olivehill/get_bus_conf.c12
-rw-r--r--src/mainboard/amd/olivehill/mptable.c1
-rw-r--r--src/mainboard/amd/parmer/get_bus_conf.c11
-rw-r--r--src/mainboard/amd/parmer/mptable.c1
-rw-r--r--src/mainboard/amd/persimmon/get_bus_conf.c14
-rw-r--r--src/mainboard/amd/persimmon/mptable.c1
-rw-r--r--src/mainboard/amd/south_station/get_bus_conf.c13
-rw-r--r--src/mainboard/amd/south_station/mptable.c1
-rw-r--r--src/mainboard/amd/thatcher/get_bus_conf.c12
-rw-r--r--src/mainboard/amd/thatcher/mptable.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/mb_sysconf.h1
-rw-r--r--src/mainboard/amd/torpedo/get_bus_conf.c12
-rw-r--r--src/mainboard/amd/torpedo/mptable.c1
-rw-r--r--src/mainboard/amd/union_station/get_bus_conf.c11
-rw-r--r--src/mainboard/amd/union_station/mptable.c1
23 files changed, 10 insertions, 129 deletions
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index c4924d4c58..f7c551431d 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -53,7 +53,6 @@ u32 hcdnx[] = {
0x20202020,
};
-u32 bus_type[256];
u32 sbdn_rs780;
u32 sbdn_sb800;
@@ -66,7 +65,7 @@ void get_bus_conf(void)
{
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
if (get_bus_conf_done == 1)
return; /* do it only once */
@@ -90,25 +89,16 @@ void get_bus_conf(void)
bus_rs780[i] = 0;
}
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
- bus_type[0] = 1; /* pci */
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_sb800[0] = bus_rs780[0];
- bus_type[bus_rs780[0]] = 1;
-
/* sb800 */
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4));
if (dev) {
bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb800[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -119,8 +109,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_sb800[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* rs780 */
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
@@ -130,7 +118,6 @@ void get_bus_conf(void)
if(255 != bus_rs780[i]) {
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- bus_type[bus_rs780[i]] = 1; /* PCI bus. */
}
}
}
diff --git a/src/mainboard/amd/bimini_fam10/mb_sysconf.h b/src/mainboard/amd/bimini_fam10/mb_sysconf.h
index ed04de663e..8148093f0f 100644
--- a/src/mainboard/amd/bimini_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/bimini_fam10/mb_sysconf.h
@@ -37,7 +37,6 @@ struct mb_sysconf_t {
u32 sbdn3;
u32 sbdn3a[31];
u32 sbdn5[31];
- u32 bus_type[256];
};
#endif
diff --git a/src/mainboard/amd/bimini_fam10/mptable.c b/src/mainboard/amd/bimini_fam10/mptable.c
index 792fa41ffe..bbdb95d177 100644
--- a/src/mainboard/amd/bimini_fam10/mptable.c
+++ b/src/mainboard/amd/bimini_fam10/mptable.c
@@ -30,7 +30,6 @@ extern int bus_isa;
extern u8 bus_rs780[11];
extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 bus_type[256];
extern u32 sbdn_rs780;
extern u32 sbdn_sb800;
diff --git a/src/mainboard/amd/dinar/get_bus_conf.c b/src/mainboard/amd/dinar/get_bus_conf.c
index d62e111d6c..fcd4684c5d 100644
--- a/src/mainboard/amd/dinar/get_bus_conf.c
+++ b/src/mainboard/amd/dinar/get_bus_conf.c
@@ -51,15 +51,13 @@ u32 hcdnx[] = {
0x20202020,
};
-u32 bus_type[256];
-
u32 sbdn_sb700;
u32 sbdn_rd890;
void get_bus_conf(void)
{
device_t dev;
- int i, j;
+ int i;
printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - Start.\n");
@@ -72,12 +70,6 @@ void get_bus_conf(void)
bus_rd890[i] = 0;
}
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
-
- bus_type[0] = 1; /* pci */
bus_rd890[0] = (pci1234x[0] >> 16) & 0xff;
bus_sb700[0] = bus_rd890[0];
@@ -92,8 +84,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb700[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
/* rd890 */
@@ -104,7 +94,6 @@ void get_bus_conf(void)
if(255 != bus_rd890[i]) {
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- bus_type[bus_rd890[i]] = 1; /* PCI bus. */
}
}
}
diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index 65304e132d..671cd37da3 100644
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -30,7 +30,6 @@
extern u8 bus_rd890[14];
extern u8 bus_sb700[2];
-extern u32 bus_type[256];
extern u32 sbdn_rd890;
extern u32 sbdn_sb700;
diff --git a/src/mainboard/amd/inagua/get_bus_conf.c b/src/mainboard/amd/inagua/get_bus_conf.c
index be113b37f5..2c38bdd2f3 100644
--- a/src/mainboard/amd/inagua/get_bus_conf.c
+++ b/src/mainboard/amd/inagua/get_bus_conf.c
@@ -43,7 +43,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_sb800;
void get_bus_conf(void)
@@ -51,18 +50,13 @@ void get_bus_conf(void)
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
- bus_type[0] = 1; /* pci */
// bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_sb800[0] = (pci1234x[0] >> 16) & 0xff;
@@ -75,8 +69,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb800[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -88,9 +80,6 @@ void get_bus_conf(void)
}
}
- for (j = bus_sb800[2]; j < bus_isa; j++)
- bus_type[j] = 1;
-
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
apicid_base = CONFIG_MAX_CPUS;
diff --git a/src/mainboard/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c
index d2f850665c..898b5971a3 100644
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -31,7 +31,6 @@ extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 bus_type[256];
extern u32 sbdn_sb800;
u8 intr_data[] = {
diff --git a/src/mainboard/amd/mahogany_fam10/mb_sysconf.h b/src/mainboard/amd/mahogany_fam10/mb_sysconf.h
index 768ffd1b30..25d63d5ffa 100644
--- a/src/mainboard/amd/mahogany_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/mahogany_fam10/mb_sysconf.h
@@ -38,7 +38,6 @@ struct mb_sysconf_t {
u32 sbdn3;
u32 sbdn3a[31];
u32 sbdn5[31];
- u32 bus_type[256];
};
#endif
diff --git a/src/mainboard/amd/olivehill/get_bus_conf.c b/src/mainboard/amd/olivehill/get_bus_conf.c
index f1643a43a7..3aeeb90d8c 100644
--- a/src/mainboard/amd/olivehill/get_bus_conf.c
+++ b/src/mainboard/amd/olivehill/get_bus_conf.c
@@ -45,7 +45,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_yangtze;
@@ -55,7 +54,7 @@ void get_bus_conf(void)
u32 value;
device_t dev;
- int i, j;
+ int i;
dev = dev_find_slot(0, PCI_DEVFN(0, 0)); /* clear IoapicSbFeatureEn */
@@ -72,11 +71,6 @@ void get_bus_conf(void)
memset(bus_yangtze, 0, sizeof(bus_yangtze));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
- bus_type[0] = 1; /* pci */
// bus_yangtze[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_yangtze[0] = (pci1234x[0] >> 16) & 0xff;
@@ -89,8 +83,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_yangtze[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -101,8 +93,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_yangtze[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index 3ccb9100c9..79750e9f6b 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -31,7 +31,6 @@
#define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_yangtze[6];
-extern u32 bus_type[256];
extern u32 sbdn_yangtze;
extern u32 apicid_yangtze;
diff --git a/src/mainboard/amd/parmer/get_bus_conf.c b/src/mainboard/amd/parmer/get_bus_conf.c
index 4c4777f0dc..c792887dff 100644
--- a/src/mainboard/amd/parmer/get_bus_conf.c
+++ b/src/mainboard/amd/parmer/get_bus_conf.c
@@ -45,7 +45,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_hudson;
@@ -54,7 +53,7 @@ void get_bus_conf(void)
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
@@ -62,11 +61,7 @@ void get_bus_conf(void)
memset(bus_hudson, 0, sizeof(bus_hudson));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
- bus_type[0] = 1; /* pci */
bus_hudson[0] = (pci1234x[0] >> 16) & 0xff;
@@ -78,8 +73,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_hudson[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -90,8 +83,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_hudson[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index 0980063727..b66cb572ec 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -31,7 +31,6 @@
#define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_hudson[6];
-extern u32 bus_type[256];
extern u32 sbdn_hudson;
extern u32 apicid_hudson;
diff --git a/src/mainboard/amd/persimmon/get_bus_conf.c b/src/mainboard/amd/persimmon/get_bus_conf.c
index b31f687671..995cb4254c 100644
--- a/src/mainboard/amd/persimmon/get_bus_conf.c
+++ b/src/mainboard/amd/persimmon/get_bus_conf.c
@@ -45,7 +45,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_sb800;
void get_bus_conf(void)
@@ -53,19 +52,13 @@ void get_bus_conf(void)
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
- bus_type[0] = 1; /* pci */
-
// bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_sb800[0] = (pci1234x[0] >> 16) & 0xff;
@@ -77,8 +70,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb800[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -90,9 +81,6 @@ void get_bus_conf(void)
}
}
- for (j = bus_sb800[2]; j < bus_isa; j++)
- bus_type[j] = 1;
-
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 780bb2c905..e9e208e9a4 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -35,7 +35,6 @@ extern u8 bus_sb800[6];
extern u32 apicid_sb800;
extern u32 apicver_sb800;
-extern u32 bus_type[256];
extern u32 sbdn_sb800;
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/amd/south_station/get_bus_conf.c b/src/mainboard/amd/south_station/get_bus_conf.c
index 99b38807b5..b95ef1c8e2 100644
--- a/src/mainboard/amd/south_station/get_bus_conf.c
+++ b/src/mainboard/amd/south_station/get_bus_conf.c
@@ -43,7 +43,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_sb800;
void get_bus_conf(void)
@@ -51,19 +50,13 @@ void get_bus_conf(void)
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
-
- bus_type[0] = 1; /* pci */
// bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_sb800[0] = (pci1234x[0] >> 16) & 0xff;
@@ -78,8 +71,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb800[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -90,8 +81,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_sb800[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* I/O APICs: APIC ID Version State Address */
diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c
index f266b4fcd7..591ece523e 100644
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -31,7 +31,6 @@ extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 bus_type[256];
extern u32 sbdn_sb800;
u8 intr_data[] = {
diff --git a/src/mainboard/amd/thatcher/get_bus_conf.c b/src/mainboard/amd/thatcher/get_bus_conf.c
index d4a565480c..577ec9fd7e 100644
--- a/src/mainboard/amd/thatcher/get_bus_conf.c
+++ b/src/mainboard/amd/thatcher/get_bus_conf.c
@@ -45,7 +45,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_hudson;
@@ -54,17 +53,12 @@ void get_bus_conf(void)
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
sbdn_hudson = 0;
memset(bus_hudson, 0, sizeof(bus_hudson));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
- bus_type[0] = 1; /* pci */
bus_hudson[0] = (pci1234x[0] >> 16) & 0xff;
@@ -76,8 +70,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_hudson[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -88,8 +80,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_hudson[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index 3269089edc..dfb3b4f0bf 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -31,7 +31,6 @@
#define IO_APIC_ID CONFIG_MAX_CPUS
extern u8 bus_hudson[6];
-extern u32 bus_type[256];
extern u32 sbdn_hudson;
extern u32 apicid_hudson;
diff --git a/src/mainboard/amd/tilapia_fam10/mb_sysconf.h b/src/mainboard/amd/tilapia_fam10/mb_sysconf.h
index 768ffd1b30..25d63d5ffa 100644
--- a/src/mainboard/amd/tilapia_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/tilapia_fam10/mb_sysconf.h
@@ -38,7 +38,6 @@ struct mb_sysconf_t {
u32 sbdn3;
u32 sbdn3a[31];
u32 sbdn5[31];
- u32 bus_type[256];
};
#endif
diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c
index b7895e4915..1e962e83e8 100644
--- a/src/mainboard/amd/torpedo/get_bus_conf.c
+++ b/src/mainboard/amd/torpedo/get_bus_conf.c
@@ -49,14 +49,13 @@ u32 hcdnx[] = {
0x20202020,
};
-u32 bus_type[256];
u32 sbdn_sb900;
void get_bus_conf(void)
{
device_t dev;
- int i, j;
+ int i;
printk(BIOS_DEBUG, "Mainboard - %s - %s - Start.\n", __FILE__, __func__);
@@ -64,11 +63,6 @@ void get_bus_conf(void)
memset(bus_sb900, 0, sizeof(bus_sb900));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
-
- bus_type[0] = 1; /* pci */
bus_sb900[0] = (pci1234x[0] >> 16) & 0xff;
@@ -79,8 +73,6 @@ void get_bus_conf(void)
bus_sb900[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb900[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -93,8 +85,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_sb900[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index ae00cf76fd..6bc1cb3b8b 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -33,7 +33,6 @@
extern u8 bus_sb900[6];
-extern u32 bus_type[256];
extern u32 sbdn_sb900;
u32 apicid_sb900;
diff --git a/src/mainboard/amd/union_station/get_bus_conf.c b/src/mainboard/amd/union_station/get_bus_conf.c
index 99b38807b5..632fedef8d 100644
--- a/src/mainboard/amd/union_station/get_bus_conf.c
+++ b/src/mainboard/amd/union_station/get_bus_conf.c
@@ -43,7 +43,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_sb800;
void get_bus_conf(void)
@@ -51,19 +50,15 @@ void get_bus_conf(void)
u32 apicid_base;
device_t dev;
- int i, j;
+ int i;
sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
- for (i = 0; i < 256; i++) {
- bus_type[i] = 0; /* default ISA bus. */
- }
- bus_type[0] = 1; /* pci */
// bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_sb800[0] = (pci1234x[0] >> 16) & 0xff;
@@ -78,8 +73,6 @@ void get_bus_conf(void)
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
- for (j = bus_sb800[1]; j < bus_isa; j++)
- bus_type[j] = 1;
}
for (i = 0; i < 4; i++) {
@@ -90,8 +83,6 @@ void get_bus_conf(void)
bus_isa++;
}
}
- for (j = bus_sb800[2]; j < bus_isa; j++)
- bus_type[j] = 1;
/* I/O APICs: APIC ID Version State Address */
diff --git a/src/mainboard/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c
index f266b4fcd7..591ece523e 100644
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -31,7 +31,6 @@ extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 bus_type[256];
extern u32 sbdn_sb800;
u8 intr_data[] = {