diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-03 11:38:43 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-04 17:20:51 +0000 |
| commit | 8052fe459c777db7985bdfed3ca198a556fc970c (patch) | |
| tree | c4a421408e507161c0f5ab71d1e7c5a4ffd00ec0 /src/mainboard/advansus | |
| parent | 0571afe5d2b576f8e89eaabf4bbd0f7a31fd0a62 (diff) | |
| download | coreboot-8052fe459c777db7985bdfed3ca198a556fc970c.tar.xz | |
amdfam10 boards: Drop const variables sbdn_sb800 and sbdn_sb700
They evaluate to const zero and obscure PCI_DEVFN() use.
Change-Id: I8bd8dced62094d5ee8e957241ac29ead054f5c05
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30632
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard/advansus')
| -rw-r--r-- | src/mainboard/advansus/a785e-i/get_bus_conf.c | 6 | ||||
| -rw-r--r-- | src/mainboard/advansus/a785e-i/irq_tables.c | 5 | ||||
| -rw-r--r-- | src/mainboard/advansus/a785e-i/mptable.c | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c index 8b995e4535..9538098c34 100644 --- a/src/mainboard/advansus/a785e-i/get_bus_conf.c +++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c @@ -46,7 +46,6 @@ u32 hcdnx[] = { static u32 sbdn_rs780; -u32 sbdn_sb800; void get_bus_conf(void) { @@ -64,7 +63,6 @@ void get_bus_conf(void) sysconf.sbdn = (sysconf.hcdn[0] & 0xff); sbdn_rs780 = sysconf.sbdn; - sbdn_sb800 = 0; memset(bus_sb800, 0, sizeof(bus_sb800)); for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) { @@ -78,13 +76,13 @@ void get_bus_conf(void) /* sb800 */ - dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4)); + dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4)); if (dev) { bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); } for (i = 0; i < 4; i++) { - dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x15, i)); + dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x15, i)); if (dev) { bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); } diff --git a/src/mainboard/advansus/a785e-i/irq_tables.c b/src/mainboard/advansus/a785e-i/irq_tables.c index b194b41b89..006a8dd155 100644 --- a/src/mainboard/advansus/a785e-i/irq_tables.c +++ b/src/mainboard/advansus/a785e-i/irq_tables.c @@ -40,7 +40,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, } extern u8 bus_sb800[6]; -extern unsigned long sbdn_sb800; unsigned long write_pirq_routing_table(unsigned long addr) { @@ -66,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) pirq->version = PIRQ_VERSION; pirq->rtr_bus = bus_sb800[0]; - pirq->rtr_devfn = ((sbdn_sb800 + 0x14) << 3) | 4; + pirq->rtr_devfn = (0x14 << 3) | 4; pirq->exclusive_irqs = 0; @@ -81,7 +80,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) slot_num = 0; /* pci bridge */ - write_pirq_info(pirq_info, bus_sb800[0], ((sbdn_sb800 + 0x14) << 3) | 4, + write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); pirq_info++; diff --git a/src/mainboard/advansus/a785e-i/mptable.c b/src/mainboard/advansus/a785e-i/mptable.c index 6dd8342d09..9188a19abc 100644 --- a/src/mainboard/advansus/a785e-i/mptable.c +++ b/src/mainboard/advansus/a785e-i/mptable.c @@ -22,7 +22,6 @@ extern u8 bus_sb800[6]; extern u32 apicid_sb800; -extern u32 sbdn_sb800; u8 intr_data[] = { [0x00] = 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, /* INTA# - INTH# */ |