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

bootm: do not require -L after -r 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-11-27 16:20:51 +01:00
parent 72bdddcca3
commit 19a0c370aa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commands/bootm.c
View File

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

1
include/boot.h
View File

@ -9,6 +9,7 @@ struct image_data {
struct image_handle *initrd;
const char *oftree;
int verify;
unsigned long initrd_address;
};
struct image_handler {