[coreboot] [v2] r4043 - trunk/coreboot-v2/src/boot

Author: stepan
Date: 2009-04-01 15:54:16 +0200 (Wed, 01 Apr 2009)
New Revision: 4043

Modified:
   trunk/coreboot-v2/src/boot/hardwaremain.c
Log:
(trivial) add filo call back for those few mainboards that still (need to) 
use the built-in filo.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/boot/hardwaremain.c
===================================================================
--- trunk/coreboot-v2/src/boot/hardwaremain.c	2009-04-01 13:43:21 UTC (rev 4042)
+++ trunk/coreboot-v2/src/boot/hardwaremain.c	2009-04-01 13:54:16 UTC (rev 4043)
@@ -89,20 +89,20 @@
    lb_mem = write_tables();

#if CONFIG_ROMFS == 1
-	printk_err("=================================================\n");
-#if USE_FALLBACK_IMAGE == 1
+# if USE_FALLBACK_IMAGE == 1
    void (*pl)(void) = romfs_load_payload(lb_mem, "fallback/payload");
-#else
+# else
    void (*pl)(void) = romfs_load_payload(lb_mem, "normal/payload");
+# endif
 #endif
-#endif

-#warning elfboot will soon be deprecated
-
-	printk_err("Trying elfboot, but that will be gone soon!\n");
+#if CONFIG_FS_PAYLOAD == 1
+#warning "CONFIG_FS_PAYLOAD is deprecated."
+	filo(lb_mem);
+#else
+#warning "elfboot will soon be deprecated."
    elfboot(lb_mem);
-
-	printk_err("NO BOOT METHOD succeeded\n");
-
+#endif
+	printk_err("Boot failed.\n");
 }