diff options
Diffstat (limited to 'src/lib/loaders/load_and_run_romstage.c')
| -rw-r--r-- | src/lib/loaders/load_and_run_romstage.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/src/lib/loaders/load_and_run_romstage.c b/src/lib/loaders/load_and_run_romstage.c index 9bd9603bab..1c2ed77abf 100644 --- a/src/lib/loaders/load_and_run_romstage.c +++ b/src/lib/loaders/load_and_run_romstage.c @@ -26,20 +26,38 @@ #include <program_loading.h> #include <timestamp.h> +extern const struct prog_loader_ops cbfs_romstage_loader; + +static const struct prog_loader_ops *loaders[] = { + &cbfs_romstage_loader, +}; + void run_romstage(void) { + int i; struct prog romstage = { .name = CONFIG_CBFS_PREFIX "/romstage", .type = PROG_ROMSTAGE, }; - timestamp_add_now(TS_START_COPYROM); - if (cbfs_load_prog_stage(CBFS_DEFAULT_MEDIA, &romstage) < 0) { - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) - die("Couldn't load romstage.\n"); - halt(); + for (i = 0; i < ARRAY_SIZE(loaders); i++) { + const struct prog_loader_ops *ops; + + ops = loaders[i]; + + printk(BIOS_DEBUG, "Trying %s romstage loader.\n", ops->name); + + timestamp_add_now(TS_START_COPYROM); + + if (ops->prepare(&romstage)) + continue; + + timestamp_add_now(TS_END_COPYROM); + + prog_run(&romstage); } - timestamp_add_now(TS_END_COPYROM); - prog_run(&romstage); + if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) + die("Couldn't load romstage.\n"); + halt(); } |