diff options
| -rw-r--r-- | commands/boot.c | 4 | ||||
| -rw-r--r-- | commands/bootm.c | 4 | ||||
| -rw-r--r-- | common/bootm.c | 13 | ||||
| -rw-r--r-- | include/boot.h | 2 |
4 files changed, 4 insertions, 19 deletions
diff --git a/commands/boot.c b/commands/boot.c index 93bf148c49..33d1177861 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -85,8 +85,8 @@ static int boot_script(char *path) data.os_address = UIMAGE_SOME_ADDRESS; data.oftree_file = getenv_or_null("global.bootm.oftree"); data.os_file = getenv_or_null("global.bootm.image"); - data.os_address = getenv_loadaddr("global.bootm.image.loadaddr"); - data.initrd_address = getenv_loadaddr("global.bootm.initrd.loadaddr"); + getenv_ul("global.bootm.image.loadaddr", &data.os_address); + getenv_ul("global.bootm.initrd.loadaddr", &data.initrd_address); data.initrd_file = getenv_or_null("global.bootm.initrd"); data.verbose = verbose; data.dryrun = dryrun; diff --git a/commands/bootm.c b/commands/bootm.c index 44facd4c55..5dff7dd674 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -68,8 +68,8 @@ static int do_bootm(int argc, char *argv[]) oftree = getenv("global.bootm.oftree"); os_file = getenv("global.bootm.image"); - data.os_address = getenv_loadaddr("global.bootm.image.loadaddr"); - data.initrd_address = getenv_loadaddr("global.bootm.initrd.loadaddr"); + getenv_ul("global.bootm.image.loadaddr", &data.os_address); + getenv_ul("global.bootm.initrd.loadaddr", &data.initrd_address); if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD)) initrd_file = getenv("global.bootm.initrd"); diff --git a/common/bootm.c b/common/bootm.c index a431dffb36..2da6e59129 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -28,19 +28,6 @@ int register_image_handler(struct image_handler *handler) return 0; } -unsigned long long getenv_loadaddr(const char *name) -{ - const char *valstr = getenv(name); - - if (!valstr) - return UIMAGE_SOME_ADDRESS; - - if (valstr[0] == '\0') - return UIMAGE_SOME_ADDRESS; - - return simple_strtoull(valstr, NULL, 0); -} - static struct image_handler *bootm_find_handler(enum filetype filetype, struct image_data *data) { diff --git a/include/boot.h b/include/boot.h index 84b4fd0b35..56f6c359b9 100644 --- a/include/boot.h +++ b/include/boot.h @@ -110,6 +110,4 @@ static inline int linux_bootargs_overwrite(const char *bootargs) #define UIMAGE_SOME_ADDRESS (UIMAGE_INVALID_ADDRESS - 1) -unsigned long long getenv_loadaddr(const char *name); - #endif /* __BOOT_H */ |