From 462e4700929ffdacc94149205adae69f8e57441c Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Fri, 5 Jan 2018 15:40:52 -0700 Subject: 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 Signed-off-by: Daniel Kurtz Reviewed-on: https://review.coreboot.org/23141 Reviewed-by: Justin TerAvest Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/common/block/pi/agesawrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c index ed10568fb2..5c25d64c90 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_ramstage(const char *name, 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); } -- cgit v1.2.3