f1f532084a
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>
96 lines
2.3 KiB
C
96 lines
2.3 KiB
C
/*
|
|
* go- execute some code anywhere (misc boot support)
|
|
*
|
|
* (C) Copyright 2000-2003
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <complete.h>
|
|
#include <fs.h>
|
|
#include <fcntl.h>
|
|
#include <linux/ctype.h>
|
|
#include <errno.h>
|
|
|
|
static int do_go(int argc, char *argv[])
|
|
{
|
|
void *addr;
|
|
int rcode = 1;
|
|
int fd = -1;
|
|
int (*func)(int argc, char *argv[]);
|
|
|
|
if (argc < 2)
|
|
return COMMAND_ERROR_USAGE;
|
|
|
|
if (!isdigit(*argv[1])) {
|
|
fd = open(argv[1], O_RDONLY);
|
|
if (fd < 0) {
|
|
perror("open");
|
|
goto out;
|
|
}
|
|
|
|
addr = memmap(fd, PROT_READ);
|
|
if (addr == (void *)-1) {
|
|
perror("memmap");
|
|
goto out;
|
|
}
|
|
} else
|
|
addr = (void *)simple_strtoul(argv[1], NULL, 16);
|
|
|
|
printf("## Starting application at 0x%p ...\n", addr);
|
|
|
|
console_flush();
|
|
|
|
func = addr;
|
|
|
|
shutdown_barebox();
|
|
|
|
if (do_execute)
|
|
do_execute(func, argc - 1, &argv[1]);
|
|
else
|
|
func(argc - 1, &argv[1]);
|
|
|
|
/*
|
|
* The application returned. Since we have shutdown barebox and
|
|
* we know nothing about the state of the cpu/memory we can't
|
|
* do anything here.
|
|
*/
|
|
while (1);
|
|
out:
|
|
if (fd > 0)
|
|
close(fd);
|
|
|
|
return rcode;
|
|
}
|
|
|
|
BAREBOX_CMD_HELP_START(go)
|
|
BAREBOX_CMD_HELP_TEXT("Start application at ADDR passing ARG as arguments.")
|
|
BAREBOX_CMD_HELP_TEXT("")
|
|
BAREBOX_CMD_HELP_TEXT("If addr does not start with a digit it is interpreted as a filename")
|
|
BAREBOX_CMD_HELP_TEXT("in which case the file is memmapped and executed")
|
|
BAREBOX_CMD_HELP_END
|
|
|
|
BAREBOX_CMD_START(go)
|
|
.cmd = do_go,
|
|
BAREBOX_CMD_DESC("start application at address or file")
|
|
BAREBOX_CMD_OPTS("ADDR [ARG...]")
|
|
BAREBOX_CMD_GROUP(CMD_GRP_BOOT)
|
|
BAREBOX_CMD_HELP(cmd_go_help)
|
|
BAREBOX_CMD_COMPLETE(command_var_complete)
|
|
BAREBOX_CMD_END
|