summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/amd/common/block/pi/heapmanager.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c
index 63db1ce265..cbffb7795a 100644
--- a/src/soc/amd/common/block/pi/heapmanager.c
+++ b/src/soc/amd/common/block/pi/heapmanager.c
@@ -73,17 +73,9 @@ AGESA_STATUS agesa_HeapRebase(UINT32 Func, UINTN Data, VOID *ConfigPtr)
AGESA_REBASE_PARAMS *Rebase;
Rebase = (AGESA_REBASE_PARAMS *)ConfigPtr;
- if (ENV_BOOTBLOCK) {
+ Rebase->HeapAddress = (UINTN)agesa_heap_base();
+ if (!Rebase->HeapAddress)
Rebase->HeapAddress = CONFIG_PI_AGESA_CAR_HEAP_BASE;
- } else {
- /*
- * todo: remove the if() above and keep the assignment here
- * once all AGESA functions are removed from bootblock.
- */
- Rebase->HeapAddress = (UINTN)agesa_heap_base();
- if (!Rebase->HeapAddress)
- Rebase->HeapAddress = CONFIG_PI_AGESA_CAR_HEAP_BASE;
- }
return AGESA_SUCCESS;
}