From b8d575c644011c2c771595e860bf1a2d4c8be392 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Mon, 16 Dec 2019 16:00:49 +0200
Subject: bootblock: Support normal/fallback mechanism again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7395e62f6682f4ef123da10ac125127a57711ec6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37760
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/lib/prog_loaders.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/lib/prog_loaders.c')

diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index 978ec16e6a..0319325841 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -60,8 +60,13 @@ void run_romstage(void)
 
 	vboot_run_logic();
 
-	if (prog_locate(&romstage))
-		goto fail;
+	if (CONFIG(ARCH_X86) && CONFIG(BOOTBLOCK_NORMAL)) {
+		if (legacy_romstage_selector(&romstage))
+			goto fail;
+	} else {
+		if (prog_locate(&romstage))
+			goto fail;
+	}
 
 	timestamp_add_now(TS_START_COPYROM);
 
-- 
cgit v1.2.3