[coreboot-gerrit] Change in coreboot[master]: amd/common/pi: Remove obsolete heapmanager workaround

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/27254


Change subject: amd/common/pi: Remove obsolete heapmanager workaround
......................................................................

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 at gmail.com>
---
M src/soc/amd/common/block/pi/heapmanager.c
1 file changed, 2 insertions(+), 10 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/27254/1

diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c
index 63db1ce..cbffb77 100644
--- a/src/soc/amd/common/block/pi/heapmanager.c
+++ b/src/soc/amd/common/block/pi/heapmanager.c
@@ -73,17 +73,9 @@
 	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;
 }

-- 
To view, visit https://review.coreboot.org/27254
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie169a691a177bcd8283c31c8188ce28bcbce82af
Gerrit-Change-Number: 27254
Gerrit-PatchSet: 1
Gerrit-Owner: Marshall Dawson <marshalldawson3rd at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180627/6f4dea90/attachment.html>