summaryrefslogtreecommitdiff
path: root/src/mainboard/asus
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/asus
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/asus')
-rw-r--r--src/mainboard/asus/f2a85-m/get_bus_conf.c11
-rw-r--r--src/mainboard/asus/f2a85-m/mptable.c1
-rw-r--r--src/mainboard/asus/m4a78-em/mb_sysconf.h1
-rw-r--r--src/mainboard/asus/m4a785-m/mb_sysconf.h1
-rw-r--r--src/mainboard/asus/m5a88-v/get_bus_conf.c14
-rw-r--r--src/mainboard/asus/m5a88-v/mb_sysconf.h1
-rw-r--r--src/mainboard/asus/m5a88-v/mptable.c1
7 files changed, 2 insertions, 28 deletions
diff --git a/src/mainboard/asus/f2a85-m/get_bus_conf.c b/src/mainboard/asus/f2a85-m/get_bus_conf.c
index 08e5795a0c..e6f79da495 100644
--- a/src/mainboard/asus/f2a85-m/get_bus_conf.c
+++ b/src/mainboard/asus/f2a85-m/get_bus_conf.c
@@ -43,7 +43,6 @@ u32 pci1234x[] = {
0x0000ff0,
};
-u32 bus_type[256];
u32 sbdn_hudson;
void get_bus_conf(void)
@@ -51,17 +50,13 @@ 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;
@@ -73,8 +68,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++) {
@@ -85,8 +78,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/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 25778ca72a..d0fd124559 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -30,7 +30,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/asus/m4a78-em/mb_sysconf.h b/src/mainboard/asus/m4a78-em/mb_sysconf.h
index 768ffd1b30..25d63d5ffa 100644
--- a/src/mainboard/asus/m4a78-em/mb_sysconf.h
+++ b/src/mainboard/asus/m4a78-em/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/asus/m4a785-m/mb_sysconf.h b/src/mainboard/asus/m4a785-m/mb_sysconf.h
index 768ffd1b30..25d63d5ffa 100644
--- a/src/mainboard/asus/m4a785-m/mb_sysconf.h
+++ b/src/mainboard/asus/m4a785-m/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/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index b312ec1b6c..3a9133ce18 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/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,16 +89,10 @@ 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));
@@ -107,8 +100,6 @@ void get_bus_conf(void)
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 +110,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 +119,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/asus/m5a88-v/mb_sysconf.h b/src/mainboard/asus/m5a88-v/mb_sysconf.h
index 289b094de8..8a693fd089 100644
--- a/src/mainboard/asus/m5a88-v/mb_sysconf.h
+++ b/src/mainboard/asus/m5a88-v/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/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c
index cb7aeee202..8d04a0cfd0 100644
--- a/src/mainboard/asus/m5a88-v/mptable.c
+++ b/src/mainboard/asus/m5a88-v/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;