[coreboot-gerrit] Change in coreboot[master]: prog_loaders: Fix ramstage loading on x86

[Nico Huber (Code Review)]

Hello Kyösti Mälkki, Werner Zeh, Aaron Durbin,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/43142

to review the following change.

Change subject: prog_loaders: Fix ramstage loading on x86
......................................................................

prog_loaders: Fix ramstage loading on x86

A regression sneaked in with 18a8ba41cc (arch/x86: Remove RELOCATABLE_
RAMSTAGE). We want to call load_relocatable_ramstage() on x86, and
cbfs_prog_stage_load() on other architectures. But with the current
code the latter is also called on x86 if the former succeeded. Fix
that and also balance the if structure to make it more obvious.

Change-Id: I5b1db5aac772b9b3a388a1a8ae490fa627334320
Signed-off-by: Nico Huber 
---
M src/lib/prog_loaders.c
1 file changed, 7 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/43142/1

diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index 419f4cd..93efc0a 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -129,10 +129,13 @@

timestamp_add_now(TS_START_COPYRAM);

-	if (ENV_X86 && load_relocatable_ramstage(&ramstage))
-		goto fail;
-	else if (cbfs_prog_stage_load(&ramstage))
-		goto fail;
+	if (ENV_X86) {
+		if (load_relocatable_ramstage(&ramstage))
+			goto fail;
+	} else {
+		if (cbfs_prog_stage_load(&ramstage))
+			goto fail;
+	}

stage_cache_add(STAGE_RAMSTAGE, &ramstage);