diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:31 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:31 +0200 |
| commit | e147a7e2bbc046c9b74d1d67ee5ae1aed0167f48 (patch) | |
| tree | 0c88f1175957abc5f7a6483ddeb9214725df45ff /commands | |
| parent | 980e793bd5411f22c89956cc0c7306507aed39e5 (diff) | |
| parent | e6b4e599b7e68b073a46e290cf089a058a1262b7 (diff) | |
| download | barebox-e147a7e2bbc046c9b74d1d67ee5ae1aed0167f48.tar.gz barebox-e147a7e2bbc046c9b74d1d67ee5ae1aed0167f48.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/bootm.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index 97a6698b9b..38dd3b23e8 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -80,6 +80,19 @@ 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; @@ -96,6 +109,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"); if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD)) initrd_file = getenv("global.bootm.initrd"); @@ -165,9 +180,12 @@ static int bootm_init(void) { globalvar_add_simple("bootm.image"); + globalvar_add_simple("bootm.image.loadaddr"); globalvar_add_simple("bootm.oftree"); - if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD)) { globalvar_add_simple("bootm.initrd"); + globalvar_add_simple("bootm.initrd.loadaddr"); + } return 0; } @@ -199,7 +217,9 @@ BAREBOX_CMD_END BAREBOX_MAGICVAR(bootargs, "Linux Kernel parameters"); BAREBOX_MAGICVAR_NAMED(global_bootm_image, global.bootm.image, "bootm default boot image"); +BAREBOX_MAGICVAR_NAMED(global_bootm_image_loadaddr, global.bootm.image.loadaddr, "bootm default boot image loadaddr"); BAREBOX_MAGICVAR_NAMED(global_bootm_initrd, global.bootm.initrd, "bootm default initrd"); +BAREBOX_MAGICVAR_NAMED(global_bootm_initrd_loadaddr, global.bootm.initrd.loadaddr, "bootm default initrd loadaddr"); static struct binfmt_hook binfmt_uimage_hook = { .type = filetype_uimage, |