-#if CONFIG_CBFS == 1
-# if USE_FALLBACK_IMAGE == 1
- void (*pl)(void) = cbfs_load_payload(lb_mem, "fallback/payload");
-# else
- void (*pl)(void) = 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
-#endif
- printk_err("Boot failed.\n");
+ cbfs_load_payload(lb_mem, CONFIG_CBFS_PREFIX "/payload");
+ printk(BIOS_ERR, "Boot failed.\n");