From: Stefan Reinauer <stepan@coresystems.de>
Date: Wed, 1 Apr 2009 13:54:16 +0000 (+0000)
Subject: (trivial) add filo call back for those few mainboards that still (need to)
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=61dc06c0601a32e5aebd5637e67af8b3697cfc3f;hp=3081bdfa44b89c2fa34eee902c13e0d1d618bff3;p=coreboot.git

(trivial) add filo call back for those few mainboards that still (need to)
use the built-in filo.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4043 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---

diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index fdecc7d9b..bf2853a4b 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -89,20 +89,20 @@ void hardwaremain(int boot_complete)
 	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");
 }