net: wget: integrate struct wget_info into legacy wget code

[J-u-boot.git] / cmd / booti.c

diff --git a/cmd/booti.c b/cmd/booti.c
index 0ab293bb880a769dbebf970be6ae37c22c44d2be..43e79e87201b992acf915c96f326070f06942919 100644 (file)
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <image.h>
@@ -34,7 +33,7 @@ static int booti_start(struct bootm_info *bmi)
        unsigned long decomp_len;
        int ctype;
 
-       ret = do_bootm_states(bmi, BOOTM_STATE_START);
+       ret = bootm_run_states(bmi, BOOTM_STATE_START);
 
        /* Setup Linux kernel Image entry point */
        if (!bmi->addr_img) {
@@ -74,12 +73,12 @@ static int booti_start(struct bootm_info *bmi)
        unmap_sysmem((void *)ld);
 
        ret = booti_setup(ld, &relocated_addr, &image_size, false);
-       if (ret || IS_ENABLED(CONFIG_SANDBOX))
+       if (ret)
                return 1;
 
        /* Handle BOOTM_STATE_LOADOS */
        if (relocated_addr != ld) {
-               printf("Moving Image from 0x%lx to 0x%lx, end=%lx\n", ld,
+               printf("Moving Image from 0x%lx to 0x%lx, end=0x%lx\n", ld,
                       relocated_addr, relocated_addr + image_size);
                memmove((void *)relocated_addr, (void *)ld, image_size);
        }
@@ -88,7 +87,7 @@ static int booti_start(struct bootm_info *bmi)
        images->os.start = relocated_addr;
        images->os.end = relocated_addr + image_size;
 
-       lmb_reserve(&images->lmb, images->ep, le32_to_cpu(image_size));
+       lmb_reserve(images->ep, le32_to_cpu(image_size));
 
        /*
         * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
@@ -141,7 +140,7 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
                states |= BOOTM_STATE_RAMDISK;
 
-       ret = do_bootm_states(&bmi, states);
+       ret = bootm_run_states(&bmi, states);
 
        return ret;
 }