2011-12-11 12:48:52 +00:00
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <image.h>
|
|
|
|
#include <libbb.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <fs.h>
|
|
|
|
#include <malloc.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <getopt.h>
|
|
|
|
|
|
|
|
static int uimage_fd;
|
|
|
|
|
|
|
|
static int uimage_flush(void *buf, unsigned int len)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = write_full(uimage_fd, buf, len);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-12-21 13:18:57 +00:00
|
|
|
static int do_uimage(int argc, char *argv[])
|
2011-12-11 12:48:52 +00:00
|
|
|
{
|
|
|
|
struct uimage_handle *handle;
|
|
|
|
int ret;
|
|
|
|
int verify = 0;
|
|
|
|
int fd;
|
|
|
|
int opt;
|
|
|
|
char *extract = NULL;
|
|
|
|
int info = 0;
|
|
|
|
int image_no = 0;
|
|
|
|
|
|
|
|
while ((opt = getopt(argc, argv, "ve:in:")) > 0) {
|
|
|
|
switch (opt) {
|
|
|
|
case 'v':
|
|
|
|
verify = 1;
|
|
|
|
break;
|
|
|
|
case 'i':
|
|
|
|
info = 1;
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
extract = optarg;
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
image_no = simple_strtoul(optarg, NULL, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (optind == argc)
|
|
|
|
return COMMAND_ERROR_USAGE;
|
|
|
|
|
|
|
|
handle = uimage_open(argv[optind]);
|
|
|
|
if (!handle)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (info) {
|
|
|
|
printf("Image at %s:\n", argv[optind]);
|
|
|
|
uimage_print_contents(handle);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (verify) {
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
printf("verifying data CRC... ");
|
2011-12-11 12:48:52 +00:00
|
|
|
ret = uimage_verify(handle);
|
2014-04-21 13:50:35 +00:00
|
|
|
if (ret)
|
2011-12-11 12:48:52 +00:00
|
|
|
goto err;
|
2014-04-21 13:50:35 +00:00
|
|
|
printf("ok\n");
|
2011-12-11 12:48:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (extract) {
|
|
|
|
fd = open(extract, O_WRONLY | O_CREAT | O_TRUNC);
|
|
|
|
if (fd < 0) {
|
|
|
|
perror("open");
|
|
|
|
ret = fd;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
uimage_fd = fd;
|
|
|
|
ret = uimage_load(handle, image_no, uimage_flush);
|
|
|
|
if (ret) {
|
|
|
|
printf("loading uImage failed with %d\n", ret);
|
|
|
|
close(fd);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
err:
|
|
|
|
uimage_close(handle);
|
|
|
|
|
|
|
|
return ret ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
BAREBOX_CMD_HELP_START(uimage)
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_HELP_TEXT("Options:")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-i\t", "show information about image")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-v\t", "verify image")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-e OUTFILE", "extract image to OUTFILE")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-n NO\t", "use image number NO in multifile image")
|
2011-12-11 12:48:52 +00:00
|
|
|
BAREBOX_CMD_HELP_END
|
|
|
|
|
|
|
|
BAREBOX_CMD_START(uimage)
|
|
|
|
.cmd = do_uimage,
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_DESC("extract/verify uImage")
|
|
|
|
BAREBOX_CMD_OPTS("[-vien] FILE")
|
commands: group 'help' output
The old output of "help" was just producing a long list, that usually
scrolled of the screen (even on a X11 terminal). This list is more
compact, and also sorted by groups.
The old output format (plus grouping) is now available with 'help -v'.
Example:
Information commands:
?, devinfo, help, iomem, meminfo, version
Boot commands:
boot, bootm, go, loadb, loads, loadx, loady, saves, uimage
...
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 14:14:05 +00:00
|
|
|
BAREBOX_CMD_GROUP(CMD_GRP_BOOT)
|
2011-12-11 12:48:52 +00:00
|
|
|
BAREBOX_CMD_HELP(cmd_uimage_help)
|
|
|
|
BAREBOX_CMD_END
|