From 5244e1ba63e5f3ea12066734bfb0d864a8f1f11d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 21 Nov 2010 14:41:07 +0000 Subject: Convert more boards to use mptable_write_buses. Signed-off-by: Patrick Georgi Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6106 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/hp/dl145_g1/get_bus_conf.c | 11 ----------- src/mainboard/hp/dl145_g1/mptable.c | 11 ++--------- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'src/mainboard/hp/dl145_g1') diff --git a/src/mainboard/hp/dl145_g1/get_bus_conf.c b/src/mainboard/hp/dl145_g1/get_bus_conf.c index 562ba935d8..e4721ce42e 100644 --- a/src/mainboard/hp/dl145_g1/get_bus_conf.c +++ b/src/mainboard/hp/dl145_g1/get_bus_conf.c @@ -13,7 +13,6 @@ // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables //busnum is default -unsigned char bus_isa = 5 ; unsigned char bus_8131_0 = 1; unsigned char bus_8131_1 = 2; unsigned char bus_8131_2 = 3; @@ -82,11 +81,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); @@ -105,11 +99,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); diff --git a/src/mainboard/hp/dl145_g1/mptable.c b/src/mainboard/hp/dl145_g1/mptable.c index 6e10a8fa2c..ba4ecf9d85 100644 --- a/src/mainboard/hp/dl145_g1/mptable.c +++ b/src/mainboard/hp/dl145_g1/mptable.c @@ -6,7 +6,6 @@ #include #include -extern unsigned char bus_isa; extern unsigned char bus_8131_0; extern unsigned char bus_8131_1; extern unsigned char bus_8131_2; @@ -21,7 +20,7 @@ extern unsigned sbdn3; static void *smp_write_config_table(void *v) { struct mp_config_table *mc; - unsigned char bus_num; + int bus_isa; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); @@ -31,13 +30,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, 0x20, IO_APIC_ADDR); -- cgit v1.2.3