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
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index cc3741f..fdecc7d 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -88,10 +88,21 @@
*/
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");
+
}