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

bootm: Add dryrun support 

This adds support for checking the bootm command without actually booting.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-09-22 11:52:34 +02:00
parent b15c5eeecf
commit 68e6eceae9
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
commands/bootm.c
View File

@ -46,7 +46,7 @@
#include <magicvar.h>
#include <asm-generic/memory_layout.h>
#define BOOTM_OPTS_COMMON "ca:e:vo:f"
#define BOOTM_OPTS_COMMON "ca:e:vo:fd"
#ifdef CONFIG_CMD_BOOTM_INITRD
#define BOOTM_OPTS BOOTM_OPTS_COMMON "L:r:"
@ -101,6 +101,9 @@ static int do_bootm(int argc, char *argv[])
case 'f':
data.force = 1;
break;
case 'd':
data.dryrun = 1;
break;
default:
break;
}
@ -125,17 +128,23 @@ static int do_bootm(int argc, char *argv[])
data.initrd_file = initrd_file;
ret = bootm_boot(&data);
if (ret) {
printf("handler failed with: %s\n", strerror(-ret));
goto err_out;
}
printf("handler failed with %s\n", strerror(-ret));
if (data.dryrun)
printf("Dryrun. Aborted\n");
err_out:
return 1;
return ret ? 1 : 0;
}
BAREBOX_CMD_HELP_START(bootm)
BAREBOX_CMD_HELP_USAGE("bootm [OPTIONS] image\n")
BAREBOX_CMD_HELP_SHORT("Boot an application image.\n")
BAREBOX_CMD_HELP_OPT ("-c", "crc check uImage data\n")
BAREBOX_CMD_HELP_OPT ("-d", "dryrun. Check data, but do not run\n")
#ifdef CONFIG_CMD_BOOTM_INITRD
BAREBOX_CMD_HELP_OPT ("-r <initrd>","specify an initrd image\n")
BAREBOX_CMD_HELP_OPT ("-L <load addr>","specify initrd load address\n")

6
common/bootm.c
View File

@ -263,6 +263,7 @@ int bootm_boot(struct bootm_data *bootm_data)
data->verbose = bootm_data->verbose;
data->verify = bootm_data->verify;
data->force = bootm_data->force;
data->dryrun = bootm_data->dryrun;
data->initrd_address = bootm_data->initrd_address;
data->os_address = bootm_data->os_address;
data->os_entry = bootm_data->os_entry;
@ -346,7 +347,10 @@ int bootm_boot(struct bootm_data *bootm_data)
printf("Passing control to %s handler\n", handler->name);
}
ret = handler->bootm(data);
if (data->dryrun)
ret = 0;
else
ret = handler->bootm(data);
err_out:
if (data->os_res)
release_sdram_region(data->os_res);

2
include/boot.h
View File

@ -14,6 +14,7 @@ struct bootm_data {
int verbose;
bool verify;
bool force;
bool dryrun;
unsigned long initrd_address;
unsigned long os_address;
unsigned long os_entry;
@ -64,6 +65,7 @@ struct image_data {
int verify;
int verbose;
int force;
int dryrun;
};
struct image_handler {