Marshall Dawson (marshalldawson3rd@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18431
-gerrit
commit ea554971c35406f439fdc583c6b9494bebe05649 Author: Marshall Dawson marshalldawson3rd@gmail.com Date: Sun Jan 29 16:40:22 2017 -0700
cpu/amd/pi: Allow stoney to use cbmem in heapmanager
Allocate memory for AGESA's heap from cbmem.
Original-Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Original-Reviewed-by: Marc Jones marcj303@gmail.com (cherry picked from commit d1f3191d8213eba431299f3cdcd91dc2ade7ca59)
Change-Id: I1eff2fddcec13a53618eeb553bace3b0eca16e95 Signed-off-by: Marc Jones marcj303@gmail.com --- src/cpu/amd/pi/heapmanager.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/cpu/amd/pi/heapmanager.c b/src/cpu/amd/pi/heapmanager.c index 7fc8fb8..efbd9e7 100644 --- a/src/cpu/amd/pi/heapmanager.c +++ b/src/cpu/amd/pi/heapmanager.c @@ -37,7 +37,9 @@ void EmptyHeap(void) memset(BiosManagerPtr, 0, BIOS_HEAP_SIZE); }
-#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) && !defined(__PRE_RAM__) +#if (IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) \ + || IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00670F00)) \ + && !defined(__PRE_RAM__)
#define AGESA_RUNTIME_SIZE 4096
@@ -83,7 +85,9 @@ 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) && !defined(__PRE_RAM__) +#if (IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00630F01) \ + || IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_PI_00670F00)) \ + && !defined(__PRE_RAM__) /* if the allocation is for runtime use simple CBMEM data */ if (Data == HEAP_CALLOUT_RUNTIME) return alloc_cbmem(AllocParams);