[coreboot-gerrit] Change in coreboot[master]: soc/amd/common: Only load post-memory AGESA into RAM when split enabled

[Daniel Kurtz (Code Review)]

Daniel Kurtz has uploaded this change for review. ( https://review.coreboot.org/23141


Change subject: soc/amd/common: Only load post-memory AGESA into RAM when split enabled
......................................................................

soc/amd/common: Only load post-memory AGESA into RAM when split enabled

CONFIG_AGESA_SPLIT_MEMORY_FILES controls whether AGESA is split into
pre- and post-memory binaries when it is built.  Building AGESA this way
is required when doing the new "load post-memory AGESA binary into ram"
feature.

Thus, condition this new path on the CONFIG option being enabled.

BUG=b:71641792
TEST=build and boot kahlee with CONFIG_AGESA_SPLIT_MEMORY_FILES disabled

Change-Id: Ibec9db67437c57092e0f7acf0e3185865dc02688
---
M src/soc/amd/common/block/pi/agesawrapper.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/23141/1

diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c
index ed10568..5c25d64 100644
--- a/src/soc/amd/common/block/pi/agesawrapper.c
+++ b/src/soc/amd/common/block/pi/agesawrapper.c
@@ -446,7 +446,7 @@
 
 static int agesa_locate_stage_file(const char *name, struct region_device *rdev)
 {
-	if (!ENV_RAMSTAGE)
+	if (!ENV_RAMSTAGE || !IS_ENABLED(CONFIG_AGESA_SPLIT_MEMORY_FILES))
 		return agesa_locate_stage_file_early(name, rdev);
 	return agesa_locate_stage_file_ramstage(name, rdev);
 }

-- 
To view, visit https://review.coreboot.org/23141
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: Ibec9db67437c57092e0f7acf0e3185865dc02688
Gerrit-Change-Number: 23141
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Kurtz <djkurtz at google.com>
Gerrit-Reviewer: Daniel Kurtz <djkurtz at chromium.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180105/97d8ec73/attachment-0001.html>