diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-09-01 08:04:47 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-02 11:08:08 +0200 |
| commit | f61bc0962be70dad8fe6e6402079aceca5adb419 (patch) | |
| tree | c194ada3b0bc14e384680f86cca7315672d4d896 /commands/bootm.c | |
| parent | f958ffb3cdeabad3f54fceed5d755c160c005671 (diff) | |
| download | barebox-f61bc0962be70dad8fe6e6402079aceca5adb419.tar.gz barebox-f61bc0962be70dad8fe6e6402079aceca5adb419.tar.xz | |
bootm: add global bootm.{image/initrd}.loadaddr support
To be able to pass the loadaddr of the image and the initrd.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/bootm.c')
| -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, |