diff options
Diffstat (limited to 'src/mainboard/asrock')
-rw-r--r-- | src/mainboard/asrock/e350m1/get_bus_conf.c | 16 | ||||
-rw-r--r-- | src/mainboard/asrock/e350m1/mptable.c | 1 | ||||
-rw-r--r-- | src/mainboard/asrock/imb-a180/get_bus_conf.c | 12 | ||||
-rw-r--r-- | src/mainboard/asrock/imb-a180/mptable.c | 1 |
4 files changed, 2 insertions, 28 deletions
diff --git a/src/mainboard/asrock/e350m1/get_bus_conf.c b/src/mainboard/asrock/e350m1/get_bus_conf.c index 99b38807b5..d3c2b125be 100644 --- a/src/mainboard/asrock/e350m1/get_bus_conf.c +++ b/src/mainboard/asrock/e350m1/get_bus_conf.c @@ -43,7 +43,6 @@ u32 pci1234x[] = { 0x0000ff0, }; -u32 bus_type[256]; u32 sbdn_sb800; void get_bus_conf(void) @@ -51,35 +50,24 @@ 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; /* 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++) { @@ -90,8 +78,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/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c index 3402da1b15..689b2b91ed 100644 --- a/src/mainboard/asrock/e350m1/mptable.c +++ b/src/mainboard/asrock/e350m1/mptable.c @@ -32,7 +32,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/asrock/imb-a180/get_bus_conf.c b/src/mainboard/asrock/imb-a180/get_bus_conf.c index eecffb59c7..bc93c546c7 100644 --- a/src/mainboard/asrock/imb-a180/get_bus_conf.c +++ b/src/mainboard/asrock/imb-a180/get_bus_conf.c @@ -42,7 +42,6 @@ u32 pci1234x[] = { 0x0000ff0, }; -u32 bus_type[256]; u32 sbdn_yangtze; void get_bus_conf(void) @@ -51,7 +50,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 */ pci_write_config32(dev, 0xF8, 0); @@ -67,11 +66,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; @@ -84,8 +78,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++) { @@ -96,8 +88,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/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c index bfad50d631..5d91524e66 100644 --- a/src/mainboard/asrock/imb-a180/mptable.c +++ b/src/mainboard/asrock/imb-a180/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; |