diff options
| -rw-r--r-- | commands/bootm.c | 13 | ||||
| -rw-r--r-- | include/boot.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index 6255c03e7d..9ae4e2287c 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -149,11 +149,11 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[]) struct image_handle *os_handle = NULL; struct image_handler *handler; struct image_data data; - u32 initrd_start; int ret = 1; memset(&data, 0, sizeof(struct image_data)); data.verify = 1; + data.initrd_address = ~0; while ((opt = getopt(argc, argv, "nr:L:")) > 0) { switch(opt) { @@ -161,13 +161,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[]) data.verify = 0; break; case 'L': - if (!data.initrd) { - eprintf("Warning -L ingnored. Specify the initrd first\n"); - break; - } - initrd_start = simple_strtoul(optarg, NULL, 0); - printf("initrd_start=0x%x\n", initrd_start); - data.initrd->header.ih_load = cpu_to_uimage(initrd_start); + data.initrd_address = simple_strtoul(optarg, NULL, 0); break; case 'r': printf("use initrd %s\n", optarg); @@ -187,6 +181,9 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[]) } } + if (data.initrd && data.initrd_address != ~0) + data.initrd->header.ih_load = cpu_to_uimage(data.initrd_address); + if (optind == argc) { ret = COMMAND_ERROR_USAGE; goto err_out; diff --git a/include/boot.h b/include/boot.h index 4901598eb3..b22514b462 100644 --- a/include/boot.h +++ b/include/boot.h @@ -9,6 +9,7 @@ struct image_data { struct image_handle *initrd; const char *oftree; int verify; + unsigned long initrd_address; }; struct image_handler { |