From 225da645adc10016bee34a79ccf63fe0f73792f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 4 Feb 2015 13:46:12 +0200 Subject: AGESA fam10 fam12 fam15: Always have HT3_SUPPORT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keep the slower HyperTransport configuration for a possible reference in fam15 boards. Change-Id: Ifcdedc6385fec80f7d02c55c2aac10e5e2429a18 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/8344 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/northbridge/amd/agesa/family10/Kconfig | 8 +++++--- src/northbridge/amd/agesa/family10/northbridge.c | 8 +------- src/northbridge/amd/agesa/family12/Kconfig | 4 ---- src/northbridge/amd/agesa/family15/Kconfig | 4 +--- src/northbridge/amd/agesa/family15/northbridge.c | 8 +------- 5 files changed, 8 insertions(+), 24 deletions(-) (limited to 'src/northbridge') diff --git a/src/northbridge/amd/agesa/family10/Kconfig b/src/northbridge/amd/agesa/family10/Kconfig index 244c133ec0..a4dc09bd68 100644 --- a/src/northbridge/amd/agesa/family10/Kconfig +++ b/src/northbridge/amd/agesa/family10/Kconfig @@ -25,19 +25,21 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY10 select MMCONF_SUPPORT if NORTHBRIDGE_AMD_AGESA_FAMILY10 -config HT3_SUPPORT - bool - default y + config HW_MEM_HOLE_SIZEK hex default 0x100000 + config HW_MEM_HOLE_SIZE_AUTO_INC bool default n + config MMCONF_BASE_ADDRESS hex default 0xE0000000 + config MMCONF_BUS_NUMBER int default 256 + endif #NORTHBRIDGE_AMD_AGESA_FAMILY10 diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index 2b2dad5530..8e47c1a5a3 100644 --- a/src/northbridge/amd/agesa/family10/northbridge.c +++ b/src/northbridge/amd/agesa/family10/northbridge.c @@ -1133,13 +1133,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max) /* Ok, We need to set the links for that device. * otherwise the device under it will not be scanned */ - int linknum; -#if CONFIG_HT3_SUPPORT - linknum = 8; -#else - linknum = 4; -#endif - add_more_links(cdb_dev, linknum); + add_more_links(cdb_dev, 8); } cores_found = 0; // one core diff --git a/src/northbridge/amd/agesa/family12/Kconfig b/src/northbridge/amd/agesa/family12/Kconfig index 16be288905..671bd4d93c 100644 --- a/src/northbridge/amd/agesa/family12/Kconfig +++ b/src/northbridge/amd/agesa/family12/Kconfig @@ -26,10 +26,6 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY12 if NORTHBRIDGE_AMD_AGESA_FAMILY12 -config HT3_SUPPORT - bool - default y - config HW_MEM_HOLE_SIZEK hex default 0x100000 diff --git a/src/northbridge/amd/agesa/family15/Kconfig b/src/northbridge/amd/agesa/family15/Kconfig index cb6b0d33c3..9d15be06fd 100644 --- a/src/northbridge/amd/agesa/family15/Kconfig +++ b/src/northbridge/amd/agesa/family15/Kconfig @@ -26,9 +26,7 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY15 select PER_DEVICE_ACPI_TABLES if NORTHBRIDGE_AMD_AGESA_FAMILY15 -config HT3_SUPPORT - bool - default y + config HW_MEM_HOLE_SIZEK hex default 0x100000 diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index c030d577d9..89e1644732 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -1131,13 +1131,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max) /* Ok, We need to set the links for that device. * otherwise the device under it will not be scanned */ - int linknum; -#if CONFIG_HT3_SUPPORT - linknum = 8; -#else - linknum = 4; -#endif - add_more_links(cdb_dev, linknum); + add_more_links(cdb_dev, 8); } family = cpuid_eax(1); -- cgit v1.2.3