Refactor copy_and_run so that it uses a single code base instead of

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

diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index c22754fe2812f44f208e178e7dcf8511ebb3dc46..d6e88de374be28165cefa4644092745fa7d57502 100644 (file)
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -103,7 +103,7 @@ void hardwaremain(int boot_complete)
 # else
        void (*pl)(void) = cbfs_load_payload(lb_mem, "normal/payload");
 # endif
-#endif
+#else
 
 #if CONFIG_FS_PAYLOAD == 1
 #warning "CONFIG_FS_PAYLOAD is deprecated."
@@ -111,6 +111,7 @@ void hardwaremain(int boot_complete)
 #else
 #warning "elfboot will soon be deprecated."
        elfboot(lb_mem);
+#endif
 #endif
        printk_err("Boot failed.\n");
 }