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>

6 files changed, 3 insertions, 38 deletions

diff --git a/src/mainboard/supermicro/h8qgi/get_bus_conf.c b/src/mainboard/supermicro/h8qgi/get_bus_conf.c
index bce973758e..d084e4896b 100644
--- a/src/mainboard/supermicro/h8qgi/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qgi/get_bus_conf.c
@@ -35,7 +35,6 @@ u8 bus_sp5100[2];
 u8 bus_sr5650[14];
 
 
-u32 bus_type[256];
 
 u32 sbdn_sr5650;
 u32 sbdn_sp5100;
@@ -43,7 +42,7 @@ u32 sbdn_sp5100;
 void get_bus_conf(void)
 {
 	device_t dev;
-	int i, j;
+	int i;
 
 	sbdn_sp5100 = 0;
 
@@ -54,11 +53,6 @@ void get_bus_conf(void)
 		bus_sr5650[i] = 0;
 	}
 
-	for (i = 0; i < 256; i++) {
-		bus_type[i] = 0; /* default ISA bus. */
-	}
-
-	bus_type[0] = 1;  /* pci */
 
 	bus_sr5650[0] = 0;
 	bus_sp5100[0] = bus_sr5650[0];
@@ -71,8 +65,6 @@ void get_bus_conf(void)
 
 		bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
 		bus_isa++;
-		for (j = bus_sp5100[1]; j < bus_isa; j++)
-			bus_type[j] = 1;
 	}
 
 	/* sr5650 */
@@ -83,7 +75,6 @@ void get_bus_conf(void)
 			if(255 != bus_sr5650[i]) {
 				bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
 				bus_isa++;
-				bus_type[bus_sr5650[i]] = 1; /* PCI bus. */
 			}
 		}
 	}
@@ -97,8 +88,6 @@ void get_bus_conf(void)
 			bus_isa++;
 		}
 	}
-	for (j = bus_sp5100[2]; j < bus_isa; j++)
-		bus_type[j] = 1;
 */
 
 
diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 2206b584d8..8b36bc79fb 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -30,7 +30,6 @@
 
 extern u8 bus_sr5650[14];
 extern u8 bus_sp5100[2];
-extern u32 bus_type[256];
 extern u32 sbdn_sr5650;
 extern u32 sbdn_sp5100;
 extern int bus_isa;
diff --git a/src/mainboard/supermicro/h8scm/get_bus_conf.c b/src/mainboard/supermicro/h8scm/get_bus_conf.c
index 9a70fcab7a..db2ca624ff 100644
--- a/src/mainboard/supermicro/h8scm/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm/get_bus_conf.c
@@ -35,7 +35,6 @@ u8 bus_sp5100[2];
 u8 bus_sr5650[14];
 
 
-u32 bus_type[256];
 
 u32 sbdn_sr5650;
 u32 sbdn_sp5100;
@@ -43,7 +42,7 @@ u32 sbdn_sp5100;
 void get_bus_conf(void)
 {
 	device_t dev;
-	int i, j;
+	int i;
 
 	sbdn_sp5100 = 0;
 
@@ -54,11 +53,6 @@ void get_bus_conf(void)
 		bus_sr5650[i] = 0;
 	}
 
-	for (i = 0; i < 256; i++) {
-		bus_type[i] = 0; /* default ISA bus. */
-	}
-
-	bus_type[0] = 1;  /* pci */
 
 	bus_sr5650[0] = 0;
 	bus_sp5100[0] = bus_sr5650[0];
@@ -71,8 +65,6 @@ void get_bus_conf(void)
 
 		bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
 		bus_isa++;
-		for (j = bus_sp5100[1]; j < bus_isa; j++)
-			bus_type[j] = 1;
 	}
 
 	/* sr5650 */
@@ -83,7 +75,6 @@ void get_bus_conf(void)
 			if(255 != bus_sr5650[i]) {
 				bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
 				bus_isa++;
-				bus_type[bus_sr5650[i]] = 1; /* PCI bus. */
 			}
 		}
 	}
@@ -97,8 +88,6 @@ void get_bus_conf(void)
 			bus_isa++;
 		}
 	}
-	for (j = bus_sp5100[2]; j < bus_isa; j++)
-		bus_type[j] = 1;
 */
 
 
diff --git a/src/mainboard/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index 2206b584d8..8b36bc79fb 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -30,7 +30,6 @@
 
 extern u8 bus_sr5650[14];
 extern u8 bus_sp5100[2];
-extern u32 bus_type[256];
 extern u32 sbdn_sr5650;
 extern u32 sbdn_sp5100;
 extern int bus_isa;
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 142c9e6982..0560180f36 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -54,7 +54,6 @@ u32 hcdnx[] = {
 	0x20202020,
 };
 
-u32 bus_type[256];
 
 u32 sbdn_sr5650;
 u32 sbdn_sp5100;
@@ -67,7 +66,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 */
@@ -92,16 +91,10 @@ void get_bus_conf(void)
 		bus_sr5650[i] = 0;
 	}
 
-	for (i = 0; i < 256; i++) {
-		bus_type[i] = 0; /* default ISA bus. */
-	}
-
-	bus_type[0] = 1;	/* pci */
 
 	bus_sr5650[0] = (sysconf.pci1234[0] >> 16) & 0xff;
 	bus_sp5100[0] = bus_sr5650[0];
 
-	bus_type[bus_sr5650[0]] = 1;
 
 	/* sp5100 */
 	dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4));
@@ -109,8 +102,6 @@ void get_bus_conf(void)
 		bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
 		bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
 		bus_isa++;
-		for (j = bus_sp5100[1]; j < bus_isa; j++)
-			bus_type[j] = 1;
 	}
 
 	/* sr5650 */
@@ -121,7 +112,6 @@ void get_bus_conf(void)
 			if(255 != bus_sr5650[i]) {
 				bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
 				bus_isa++;
-				bus_type[bus_sr5650[i]] = 1; /* PCI bus. */
 			}
 		}
 	}
diff --git a/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h
index 768ffd1b30..25d63d5ffa 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h
+++ b/src/mainboard/supermicro/h8scm_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