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

bootm: move getenv_loadaddr from command to common 

getenv_loadaddr may be used by other code, so move it
from command/ to common/

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-09-22 12:53:30 +02:00
parent feb2e4a947
commit fc5923d975
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commands/bootm.c
View File

@ -75,19 +75,6 @@ static char *bootm_image_name_and_no(const char *name, int *no)
#define BOOTM_OPTS BOOTM_OPTS_COMMON
#endif
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 int do_bootm(int argc, char *argv[])
{
int opt;

13
common/bootm.c
View File

@ -26,6 +26,19 @@ 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

@ -96,4 +96,6 @@ static inline int linux_bootargs_overwrite(const char *bootargs)
int bootm_boot(struct image_data *);
unsigned long long getenv_loadaddr(const char *name);
#endif /* __BOOT_H */