diff options
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/Config.lb | 3 | ||||
| -rw-r--r-- | src/boot/hardwaremain.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/boot/Config.lb b/src/boot/Config.lb index f9206bd3aa..700f19d917 100644 --- a/src/boot/Config.lb +++ b/src/boot/Config.lb @@ -1,7 +1,8 @@ -object elfboot.o object hardwaremain.o if CONFIG_CBFS object selfboot.o +else + object elfboot.o end if CONFIG_FS_PAYLOAD object filo.o diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index c22754fe28..d6e88de374 100644 --- 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." @@ -112,6 +112,7 @@ void hardwaremain(int boot_complete) #warning "elfboot will soon be deprecated." elfboot(lb_mem); #endif +#endif printk_err("Boot failed.\n"); } |