From b98391c0ee3d9d95b3c256e3ce170ff52b98b2c4 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 13 Jul 2017 13:14:16 +0300 Subject: AMD K8 fam10-15: Tidy up CAR disable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid conflicting disable_cache_as_ram() declaration and tidy up include for inlined function. Change-Id: Iba77c711f5eb023566b7d8ba148583948661bc99 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/20563 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/cpu/amd/family_10h-family_15h/Makefile.inc | 1 + src/cpu/amd/family_10h-family_15h/init_cpus.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/cpu/amd/family_10h-family_15h') diff --git a/src/cpu/amd/family_10h-family_15h/Makefile.inc b/src/cpu/amd/family_10h-family_15h/Makefile.inc index c540320bfb..2ed76e1e1f 100644 --- a/src/cpu/amd/family_10h-family_15h/Makefile.inc +++ b/src/cpu/amd/family_10h-family_15h/Makefile.inc @@ -1,4 +1,5 @@ romstage-y += ../../x86/mtrr/earlymtrr.c +romstage-y += ../car/post_cache_as_ram.c romstage-y += init_cpus.c diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c index f5a949cede..0ecd040253 100644 --- a/src/cpu/amd/family_10h-family_15h/init_cpus.c +++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c @@ -34,7 +34,7 @@ #include #endif -#include "cpu/amd/car/post_cache_as_ram.c" +#include "cpu/amd/car/disable_cache_as_ram.c" #if IS_ENABLED(CONFIG_PCI_IO_CFG_EXT) static void set_EnableCf8ExtCfg(void) @@ -353,7 +353,7 @@ static void STOP_CAR_AND_CPU(uint8_t skip_sharedc_config, uint32_t apicid) } } - disable_cache_as_ram(skip_sharedc_config); // inline + disable_cache_as_ram_real(skip_sharedc_config); // inline /* Mark the core as sleeping */ lapic_write(LAPIC_MSG_REG, (apicid << 24) | F10_APSTATE_ASLEEP); -- cgit v1.2.3