From 418c2bb29bc45440ff16ba6bd4d914e8d279eabc Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Wed, 27 Jun 2018 10:45:33 -0600 Subject: [PATCH] amd/common/pi: Remove obsolete heapmanager workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/27254 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki Reviewed-by: Martin Roth Reviewed-by: Paul Menzel --- src/soc/amd/common/block/pi/heapmanager.c | 12 ++---------- 1 file 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; }