diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2010-11-21 14:41:07 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-11-21 14:41:07 +0000 |
| commit | 5244e1ba63e5f3ea12066734bfb0d864a8f1f11d (patch) | |
| tree | e389268c9bb473c457df4e7ab1de60922e0c7adf /src/mainboard/tyan/s2885 | |
| parent | 8cda9699d4a2fea8ed2c5e4a7e66e8e1e0f831df (diff) | |
| download | coreboot-5244e1ba63e5f3ea12066734bfb0d864a8f1f11d.tar.xz | |
Convert more boards to use mptable_write_buses.
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6106 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/tyan/s2885')
| -rw-r--r-- | src/mainboard/tyan/s2885/get_bus_conf.c | 14 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2885/mptable.c | 11 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/mainboard/tyan/s2885/get_bus_conf.c b/src/mainboard/tyan/s2885/get_bus_conf.c index a511afa395..5cb760da2f 100644 --- a/src/mainboard/tyan/s2885/get_bus_conf.c +++ b/src/mainboard/tyan/s2885/get_bus_conf.c @@ -12,7 +12,6 @@ // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables //busnum is default -unsigned char bus_isa = 7 ; unsigned char bus_8131_0 = 1; unsigned char bus_8131_1 = 2; unsigned char bus_8131_2 = 3; @@ -85,11 +84,6 @@ void get_bus_conf(void) dev = dev_find_slot(bus_8111_0, PCI_DEVFN(sysconf.sbdn,0)); if (dev) { bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS); -#if CONFIG_HT_CHAIN_END_UNITID_BASE >= CONFIG_HT_CHAIN_UNITID_BASE - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; -// printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa); -#endif } else { printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:03.0, using defaults\n", bus_8111_0); @@ -108,12 +102,6 @@ void get_bus_conf(void) dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3+1,0)); if (dev) { bus_8131_2 = pci_read_config8(dev, PCI_SECONDARY_BUS); -#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; -// printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa); -#endif - } else { printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:02.0, using defaults\n", bus_8131_0); @@ -128,8 +116,6 @@ void get_bus_conf(void) if (dev) { bus_8151_1 = pci_read_config8(dev, PCI_SECONDARY_BUS); // printk(BIOS_DEBUG, "bus_8151_1=%d\n",bus_8151_1); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } /*I/O APICs: APIC ID Version State Address*/ diff --git a/src/mainboard/tyan/s2885/mptable.c b/src/mainboard/tyan/s2885/mptable.c index 733e82bef3..d3a26207e2 100644 --- a/src/mainboard/tyan/s2885/mptable.c +++ b/src/mainboard/tyan/s2885/mptable.c @@ -6,7 +6,6 @@ #include <stdint.h> #include <cpu/amd/amdk8_sysconf.h> -extern unsigned char bus_isa; extern unsigned char bus_8131_0; extern unsigned char bus_8131_1; extern unsigned char bus_8131_2; @@ -24,8 +23,7 @@ extern unsigned sbdn5; static void *smp_write_config_table(void *v) { struct mp_config_table *mc; - unsigned char bus_num; - int i; + int i, bus_isa; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); @@ -35,12 +33,7 @@ static void *smp_write_config_table(void *v) get_bus_conf(); -/*Bus: Bus ID Type*/ - /* define bus and isa numbers */ - for(bus_num = 0; bus_num < bus_isa; bus_num++) { - smp_write_bus(mc, bus_num, "PCI "); - } - smp_write_bus(mc, bus_isa, "ISA "); + mptable_write_buses(mc, NULL, &bus_isa); /*I/O APICs: APIC ID Version State Address*/ smp_write_ioapic(mc, apicid_8111, 0x11, IO_APIC_ADDR); //8111 |