From 50036324070be4336096c111918dc1e1a3ea69a3 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 18 May 2016 13:35:21 +0300 Subject: AGESA: Fix invalid use of CFG_ declarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The declarations of CFG_ evaluate to correct values only when included after the definitions of BLDCFG_ in buildOpts.c. So we never have CFG_PLAT_NUM_IO_APICS defined here. Change-Id: I94b3dee5a3207b37921eb24a0bcd73b5a217b2d3 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/14887 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/northbridge/amd/agesa/family15tn/northbridge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/northbridge/amd/agesa/family15tn/northbridge.c') diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 50afe73e46..576334d28e 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -1070,11 +1070,11 @@ static void cpu_bus_scan(device_t dev) * This is needed because many IO-APIC devices only have 4 bits * for their APIC id and therefore must reside at 0..15 */ -#ifndef CFG_PLAT_NUM_IO_APICS /* defined in mainboard buildOpts.c */ -#define CFG_PLAT_NUM_IO_APICS 3 -#endif - if ((node_nums * core_max) + CFG_PLAT_NUM_IO_APICS >= 0x10) { - lapicid_start = (CFG_PLAT_NUM_IO_APICS - 1) / core_max; + + u8 plat_num_io_apics = 3; /* FIXME */ + + if ((node_nums * core_max) + plat_num_io_apics >= 0x10) { + lapicid_start = (plat_num_io_apics - 1) / core_max; lapicid_start = (lapicid_start + 1) * core_max; printk(BIOS_SPEW, "lpaicid_start=0x%x ", lapicid_start); } -- cgit v1.2.3