diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-29 20:30:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-01 21:40:41 +0200 |
| commit | 61269bd7c68162b9ed7486adb82b81d358e5d60b (patch) | |
| tree | 9fa84a942f64e7d3ddcd0aca361d6e9a92c2d7da /commands/bootm.c | |
| parent | 40235880640527f07bb4c1bf963b0a4159e8e7fb (diff) | |
| download | barebox-61269bd7c68162b9ed7486adb82b81d358e5d60b.tar.gz barebox-61269bd7c68162b9ed7486adb82b81d358e5d60b.tar.xz | |
bootm: fix initrd handling
bootm_initrd tests for data->initrd, but this never becomes true because
the settingof data->initrd is inside a if(bootm_initrd()). Fix this. Also,
do not support the initrd options when initrd is disabled.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/bootm.c')
| -rw-r--r-- | commands/bootm.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index 322e74fdd7..0c0e56a617 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -51,18 +51,6 @@ static LIST_HEAD(handler_list); -#ifdef CONFIG_CMD_BOOTM_INITRD -static inline int bootm_initrd(struct image_data *data) -{ - return data->initrd ? 1 : 0; -} -#else -static inline int bootm_initrd(struct image_data *data) -{ - return 0; -} -#endif - int register_image_handler(struct image_handler *handler) { list_add_tail(&handler->list, &handler_list); @@ -258,6 +246,14 @@ static void bootm_image_name_and_no(char *name, int *no) *no = simple_strtoul(at, NULL, 10); } +#define BOOTM_OPTS_COMMON "ca:e:vo:f" + +#ifdef CONFIG_CMD_BOOTM_INITRD +#define BOOTM_OPTS BOOTM_OPTS_COMMON "L:r:" +#else +#define BOOTM_OPTS BOOTM_OPTS_COMMON +#endif + static int do_bootm(int argc, char *argv[]) { int opt; @@ -275,7 +271,7 @@ static int do_bootm(int argc, char *argv[]) data.verify = 0; data.verbose = 0; - while ((opt = getopt(argc, argv, "cL:r:a:e:vo:f")) > 0) { + while ((opt = getopt(argc, argv, BOOTM_OPTS)) > 0) { switch(opt) { case 'c': data.verify = 1; @@ -336,7 +332,7 @@ static int do_bootm(int argc, char *argv[]) } } - if (bootm_initrd(&data)) { + if (IS_ENABLED(CONFIG_CMD_BOOTM_INITRD) && data.initrd_file) { bootm_image_name_and_no(data.initrd_file, &data.initrd_num); initrd_type = file_name_detect_type(data.initrd_file); |