summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2018-01-05 15:40:52 -0700
committerMartin Roth <martinroth@google.com>2018-01-07 18:47:12 +0000
commit462e4700929ffdacc94149205adae69f8e57441c (patch)
tree302afa8fc70a8ca4cfe802e75cd3506e2d8f794d /src/soc
parenta241d6c76bf43b16a3022ae036e5b84822269ec7 (diff)
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 <djkurtz@chromium.org> Reviewed-on: https://review.coreboot.org/23141 Reviewed-by: Justin TerAvest <teravest@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/common/block/pi/agesawrapper.c2
1 files changed, 1 insertions, 1 deletions
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);
}