diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-07-13 13:14:16 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-22 20:24:31 +0000 |
| commit | b98391c0ee3d9d95b3c256e3ce170ff52b98b2c4 (patch) | |
| tree | 95db27ec9a2a183f935bd1f3c62103d71be425d2 /src/cpu/amd/car/post_cache_as_ram.c | |
| parent | a429761b7befa46f638e6fa2e5dc83fc2a2d46cb (diff) | |
AMD K8 fam10-15: Tidy up CAR disable
Avoid conflicting disable_cache_as_ram() declaration and tidy
up include for inlined function.
Change-Id: Iba77c711f5eb023566b7d8ba148583948661bc99
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/20563
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/cpu/amd/car/post_cache_as_ram.c')
| -rw-r--r-- | src/cpu/amd/car/post_cache_as_ram.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c index 064222a454..c647254c70 100644 --- a/src/cpu/amd/car/post_cache_as_ram.c +++ b/src/cpu/amd/car/post_cache_as_ram.c @@ -26,9 +26,17 @@ #include <cpu/amd/msr.h> #include <arch/acpi.h> #include <romstage_handoff.h> -#include "cbmem.h" +#include <cbmem.h> + #include "cpu/amd/car/disable_cache_as_ram.c" +// For set_sysinfo_in_ram() +#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8) +#include "northbridge/amd/amdk8/raminit.h" +#else +#include "northbridge/amd/amdfam10/raminit.h" +#endif + #if CONFIG_RAMTOP <= 0x100000 #error "You need to set CONFIG_RAMTOP greater than 1M" #endif @@ -171,7 +179,7 @@ void post_cache_as_ram(void) void cache_as_ram_new_stack(void) { print_car_debug("Disabling cache as RAM now\n"); - disable_cache_as_ram_bsp(); + disable_cache_as_ram_real(0); // inline disable_cache(); /* Enable cached access to RAM in the range 0M to CACHE_TMP_RAMTOP */ |