diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-12-16 16:00:49 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-27 08:59:20 +0000 |
| commit | b8d575c644011c2c771595e860bf1a2d4c8be392 (patch) | |
| tree | b76a1644b234d817c0dbd12af36e959dffd120d4 /src/lib | |
| parent | 12b1d7df70f8b73de250727fdfd81f2b2cea54a9 (diff) | |
bootblock: Support normal/fallback mechanism again
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>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/prog_loaders.c | 9 |
1 files changed, 7 insertions, 2 deletions
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); |