diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2018-06-27 10:45:33 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-28 09:29:16 +0000 |
| commit | 418c2bb29bc45440ff16ba6bd4d914e8d279eabc (patch) | |
| tree | c1e08a6ac71eb919b7ae1cadf076fea05082b1ca /src/soc/amd/common/block/pi/heapmanager.c | |
| parent | ebc1e2163f90f9615adb9e374b9f72a38ced7890 (diff) | |
amd/common/pi: Remove obsolete heapmanager workaround
Remove residual code that allowed successful building of the heapmanager
code. Now that stoneyridge no longer makes AGESA calls in bootblock, it
is safe to elimate the workaround.
BUG=b:74518368
TEST=boot Grunt
Change-Id: Ie169a691a177bcd8283c31c8188ce28bcbce82af
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/27254
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/soc/amd/common/block/pi/heapmanager.c')
| -rw-r--r-- | src/soc/amd/common/block/pi/heapmanager.c | 12 |
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; } |