diff options
Diffstat (limited to 'src/boot/hardwaremain.c')
-rw-r--r-- | src/boot/hardwaremain.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index a0543401ed..5ab14fb09a 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -96,21 +96,10 @@ void hardwaremain(int boot_complete) * write our configuration tables. */ lb_mem = write_tables(); -#if CONFIG_CBFS == 1 -# if CONFIG_USE_FALLBACK_IMAGE == 1 +#if CONFIG_USE_FALLBACK_IMAGE == 1 cbfs_load_payload(lb_mem, "fallback/payload"); -# else - cbfs_load_payload(lb_mem, "normal/payload"); -# endif -#else - -#if CONFIG_FS_PAYLOAD == 1 -#warning "CONFIG_FS_PAYLOAD is deprecated." - filo(lb_mem); #else -#warning "elfboot will soon be deprecated." - elfboot(lb_mem); -#endif + cbfs_load_payload(lb_mem, "normal/payload"); #endif printk(BIOS_ERR, "Boot failed.\n"); } |