tools: image: fix "algo" property of public key for verified boot

[people/ms/u-boot.git] / common / bootm.c

diff --git a/common/bootm.c b/common/bootm.c
index b2c09126cecd380d914483de00c0e147c513928c..9493a306cd038d86b08575dba7cf97a1238933f6 100644 (file)
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -55,8 +55,8 @@ static void boot_start_lmb(bootm_headers_t *images)
 
        lmb_init(&images->lmb);
 
-       mem_start = getenv_bootm_low();
-       mem_size = getenv_bootm_size();
+       mem_start = env_get_bootm_low();
+       mem_size = env_get_bootm_size();
 
        lmb_add(&images->lmb, (phys_addr_t)mem_start, mem_size);
 
@@ -72,7 +72,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc,
                       char * const argv[])
 {
        memset((void *)&images, 0, sizeof(images));
-       images.verify = getenv_yesno("verify");
+       images.verify = env_get_yesno("verify");
 
        boot_start_lmb(&images);
 
@@ -524,7 +524,7 @@ static void fixup_silent_linux(void)
 {
        char *buf;
        const char *env_val;
-       char *cmdline = getenv("bootargs");
+       char *cmdline = env_get("bootargs");
        int want_silent;
 
        /*
@@ -534,7 +534,7 @@ static void fixup_silent_linux(void)
         *      yes - we always fixup
         *      unset - we rely on the console silent flag
         */
-       want_silent = getenv_yesno("silent_linux");
+       want_silent = env_get_yesno("silent_linux");
        if (want_silent == 0)
                return;
        else if (want_silent == -1 && !(gd->flags & GD_FLG_SILENT))
@@ -569,7 +569,7 @@ static void fixup_silent_linux(void)
                env_val = CONSOLE_ARG;
        }
 
-       setenv("bootargs", env_val);
+       env_set("bootargs", env_val);
        debug("after silent fix-up: %s\n", env_val);
        free(buf);
 }
@@ -645,8 +645,8 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
                ret = boot_ramdisk_high(&images->lmb, images->rd_start,
                        rd_len, &images->initrd_start, &images->initrd_end);
                if (!ret) {
-                       setenv_hex("initrd_start", images->initrd_start);
-                       setenv_hex("initrd_end", images->initrd_end);
+                       env_set_hex("initrd_start", images->initrd_start);
+                       env_set_hex("initrd_end", images->initrd_end);
                }
        }
 #endif
@@ -691,7 +691,7 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 #ifdef CONFIG_TRACE
        /* Pretend to run the OS, then run a user command */
        if (!ret && (states & BOOTM_STATE_OS_FAKE_GO)) {
-               char *cmd_list = getenv("fakegocmd");
+               char *cmd_list = env_get("fakegocmd");
 
                ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_FAKE_GO,
                                images, boot_fn);
@@ -810,9 +810,6 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
 
        bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
 
-       /* copy from dataflash if needed */
-       img_addr = genimg_get_image(img_addr);
-
        /* check image type, for FIT images get FIT kernel node */
        *os_data = *os_len = 0;
        buf = map_sysmem(img_addr, 0);