summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorDave Frodin <dave.frodin@se-eng.com>2015-01-20 18:00:57 -0700
committerDave Frodin <dave.frodin@se-eng.com>2015-02-21 00:27:17 +0100
commit1cc3338c1d35421ae6cc8f53037b14b8a3759b62 (patch)
treef1effa24e35840ad00ccc4fd6db56cf15ce25a36 /src/cpu
parentfa0ab8cfc25074632124b5dbbc07dda07f1070f9 (diff)
downloadcoreboot-1cc3338c1d35421ae6cc8f53037b14b8a3759b62.tar.xz
cpu/amd/pi: Use alloc_cbmem() only in ramstage
Without this change the builder would fail with the complaint that there was a global static variable in romstage. alloc_cbmem() is only called in ramstage. The alternative was to add */cpu/amd/pi/*.romstage.o to the list of illegal_globals EXCLUDE_FILEs in arch/x86/init/romstage.ld. TEST: Booted the amd/lamar board. Change-Id: I5167910ff790a3152a4ad8e5af0a4a3b17894f0f Signed-off-by: Dave Frodin <dave.frodin@se-eng.com> Reviewed-on: http://review.coreboot.org/8256 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/amd/pi/heapmanager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/amd/pi/heapmanager.c b/src/cpu/amd/pi/heapmanager.c
index 22c72fb941..e33b29f22c 100644
--- a/src/cpu/amd/pi/heapmanager.c
+++ b/src/cpu/amd/pi/heapmanager.c
@@ -28,7 +28,7 @@ void EmptyHeap(void)
memset(BiosManagerPtr, 0, BIOS_HEAP_SIZE);
}
-#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01)
+#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) && !defined(__PRE_RAM__)
#define AGESA_RUNTIME_SIZE 4096
@@ -74,7 +74,7 @@ AGESA_STATUS agesa_AllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
AllocParams = ((AGESA_BUFFER_PARAMS *) ConfigPtr);
AllocParams->BufferPointer = NULL;
-#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01)
+#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) && !defined(__PRE_RAM__)
/* if the allocation is for runtime use simple CBMEM data */
if (Data == HEAP_CALLOUT_RUNTIME)
return alloc_cbmem(AllocParams);