Remove:

[coreboot.git] / src / boot / hardwaremain.c

diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index a0543401ed8dfaab84b58a20261696e0c108a243..5ab14fb09a7661b86ca9e3e2cd2d953ae7c50ba4 100644 (file)
--- 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");
 }