diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-04-01 13:54:16 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-04-01 13:54:16 +0000 |
| commit | 61dc06c0601a32e5aebd5637e67af8b3697cfc3f (patch) | |
| tree | edadc67d6edc3b670370f0a67437fe3f12e8d831 /src/boot | |
| parent | 3081bdfa44b89c2fa34eee902c13e0d1d618bff3 (diff) | |
(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
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/hardwaremain.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index fdecc7d9ba..bf2853a4b9 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"); } |