sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

bootm: Replace getenv_loadaddr with getenv_ul 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-09-25 08:10:07 +02:00
parent 7ade2ef4a9
commit 0546e669a2
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/boot.c
View File

@ -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;

4
commands/bootm.c
View File

@ -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");

13
common/bootm.c
View File

@ -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)
{

2
include/boot.h
View File

@ -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 */