This code adds support for coreboot images that use ROMFS.
It also removes the call to FILO from hardwaremain -- that has needed removal for a long time. abuild tested. Note that this code has been tested and works on both qemu and kontron. The changes to use it are coming next. Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4039 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
committed by
Patrick Georgi
parent
f834e20ba3
commit
ae63126346
@@ -88,10 +88,21 @@ void hardwaremain(int boot_complete)
|
||||
*/
|
||||
lb_mem = write_tables();
|
||||
|
||||
#if CONFIG_FS_PAYLOAD == 1
|
||||
filo(lb_mem);
|
||||
#if CONFIG_ROMFS == 1
|
||||
printk_err("=================================================\n");
|
||||
#if USE_FALLBACK_IMAGE == 1
|
||||
void (*pl)(void) = romfs_load_payload(lb_mem, "fallback/payload");
|
||||
#else
|
||||
elfboot(lb_mem);
|
||||
void (*pl)(void) = romfs_load_payload(lb_mem, "normal/payload");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#warning elfboot will soon be deprecated
|
||||
|
||||
printk_err("Trying elfboot, but that will be gone soon!\n");
|
||||
elfboot(lb_mem);
|
||||
|
||||
printk_err("NO BOOT METHOD succeeded\n");
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user