diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 6 | ||||
| -rw-r--r-- | common/board_r.c | 2 | ||||
| -rw-r--r-- | common/bootm.c | 4 | ||||
| -rw-r--r-- | common/bootm_os.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index c52bad84a4..41f18208c3 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -278,12 +278,12 @@ static void process_fdt_options(const void *blob) /* Add an env variable to point to a kernel payload, if available */ addr = fdtdec_get_config_int(gd->fdt_blob, "kernel-offset", 0); if (addr) - setenv_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); + env_set_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); /* Add an env variable to point to a root disk, if available */ addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0); if (addr) - setenv_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); + env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); #endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */ } @@ -300,7 +300,7 @@ const char *bootdelay_process(void) bootcount = bootcount_load(); bootcount++; bootcount_store(bootcount); - setenv_ulong("bootcount", bootcount); + env_set_ulong("bootcount", bootcount); bootlimit = getenv_ulong("bootlimit", 10, 0); #endif /* CONFIG_BOOTCOUNT_LIMIT */ diff --git a/common/board_r.c b/common/board_r.c index a4a7384f8b..016dc0262c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -486,7 +486,7 @@ static int initr_env(void) else set_default_env(NULL); #ifdef CONFIG_OF_CONTROL - setenv_addr("fdtcontroladdr", gd->fdt_blob); + env_set_addr("fdtcontroladdr", gd->fdt_blob); #endif /* Initialize from environment */ diff --git a/common/bootm.c b/common/bootm.c index f5ecc06d52..e34617a145 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -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 diff --git a/common/bootm_os.c b/common/bootm_os.c index d9e6e937f7..86a37cb925 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -23,7 +23,7 @@ static int do_bootm_standalone(int flag, int argc, char * const argv[], /* Don't start if "autostart" is set to "no" */ s = getenv("autostart"); if ((s != NULL) && !strcmp(s, "no")) { - setenv_hex("filesize", images->os.image_len); + env_set_hex("filesize", images->os.image_len); return 0; } appl = (int (*)(int, char * const []))images->ep; |