projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: OMAP4+: Add support for dynamically selecting OPPs
[oweals/u-boot.git]
/
common
/
cli.c
diff --git
a/common/cli.c
b/common/cli.c
index 119d282bc240d82ba4cfcc050c1cb5c118709cb1..a433ef21663cfb112cb6acd40e38057f22acab1e 100644
(file)
--- a/
common/cli.c
+++ b/
common/cli.c
@@
-18,6
+18,7
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_CMDLINE
/*
* Run a command using the selected parser.
*
/*
* Run a command using the selected parser.
*
@@
-27,7
+28,7
@@
DECLARE_GLOBAL_DATA_PTR;
*/
int run_command(const char *cmd, int flag)
{
*/
int run_command(const char *cmd, int flag)
{
-#ifndef CONFIG_
SYS_
HUSH_PARSER
+#ifndef CONFIG_HUSH_PARSER
/*
* cli_run_command can return 0 or 1 for success, so clean up
* its result.
/*
* cli_run_command can return 0 or 1 for success, so clean up
* its result.
@@
-54,7
+55,7
@@
int run_command(const char *cmd, int flag)
*/
int run_command_repeatable(const char *cmd, int flag)
{
*/
int run_command_repeatable(const char *cmd, int flag)
{
-#ifndef CONFIG_
SYS_
HUSH_PARSER
+#ifndef CONFIG_HUSH_PARSER
return cli_simple_run_command(cmd, flag);
#else
/*
return cli_simple_run_command(cmd, flag);
#else
/*
@@
-68,6
+69,7
@@
int run_command_repeatable(const char *cmd, int flag)
return 0;
#endif
}
return 0;
#endif
}
+#endif /* CONFIG_CMDLINE */
int run_command_list(const char *cmd, int len, int flag)
{
int run_command_list(const char *cmd, int len, int flag)
{
@@
-77,7
+79,7
@@
int run_command_list(const char *cmd, int len, int flag)
if (len == -1) {
len = strlen(cmd);
if (len == -1) {
len = strlen(cmd);
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
/* hush will never change our string */
need_buff = 0;
#else
/* hush will never change our string */
need_buff = 0;
#else
@@
-92,7
+94,7
@@
int run_command_list(const char *cmd, int len, int flag)
memcpy(buff, cmd, len);
buff[len] = '\0';
}
memcpy(buff, cmd, len);
buff[len] = '\0';
}
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON);
#else
/*
rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON);
#else
/*
@@
-102,7
+104,11
@@
int run_command_list(const char *cmd, int len, int flag)
* doing a malloc() which is actually required only in a case that
* is pretty rare.
*/
* doing a malloc() which is actually required only in a case that
* is pretty rare.
*/
+#ifdef CONFIG_CMDLINE
rcode = cli_simple_run_command_list(buff, flag);
rcode = cli_simple_run_command_list(buff, flag);
+#else
+ rcode = board_run_command(buff);
+#endif
#endif
if (need_buff)
free(buff);
#endif
if (need_buff)
free(buff);
@@
-166,7
+172,9
@@
bool cli_process_fdt(const char **cmdp)
*/
void cli_secure_boot_cmd(const char *cmd)
{
*/
void cli_secure_boot_cmd(const char *cmd)
{
+#ifdef CONFIG_CMDLINE
cmd_tbl_t *cmdtp;
cmd_tbl_t *cmdtp;
+#endif
int rc;
if (!cmd) {
int rc;
if (!cmd) {
@@
-178,6
+186,7
@@
void cli_secure_boot_cmd(const char *cmd)
disable_ctrlc(1);
/* Find the command directly. */
disable_ctrlc(1);
/* Find the command directly. */
+#ifdef CONFIG_CMDLINE
cmdtp = find_cmd(cmd);
if (!cmdtp) {
printf("## Error: \"%s\" not defined\n", cmd);
cmdtp = find_cmd(cmd);
if (!cmdtp) {
printf("## Error: \"%s\" not defined\n", cmd);
@@
-187,6
+196,10
@@
void cli_secure_boot_cmd(const char *cmd)
/* Run the command, forcing no flags and faking argc and argv. */
rc = (cmdtp->cmd)(cmdtp, 0, 1, (char **)&cmd);
/* Run the command, forcing no flags and faking argc and argv. */
rc = (cmdtp->cmd)(cmdtp, 0, 1, (char **)&cmd);
+#else
+ rc = board_run_command(cmd);
+#endif
+
/* Shouldn't ever return from boot command. */
printf("## Error: \"%s\" returned (code %d)\n", cmd, rc);
/* Shouldn't ever return from boot command. */
printf("## Error: \"%s\" returned (code %d)\n", cmd, rc);
@@
-201,18
+214,20
@@
err:
void cli_loop(void)
{
void cli_loop(void)
{
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
parse_file_outer();
/* This point is never reached */
for (;;);
parse_file_outer();
/* This point is never reached */
for (;;);
-#el
se
+#el
if defined(CONFIG_CMDLINE)
cli_simple_loop();
cli_simple_loop();
-#endif /*CONFIG_SYS_HUSH_PARSER*/
+#else
+ printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");
+#endif /*CONFIG_HUSH_PARSER*/
}
void cli_init(void)
{
}
void cli_init(void)
{
-#ifdef CONFIG_
SYS_
HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
u_boot_hush_start();
#endif
u_boot_hush_start();
#endif