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 18d7e198a88235bd06fc82b6466d6bb865286071..a433ef21663cfb112cb6acd40e38057f22acab1e 100644
(file)
--- a/
common/cli.c
+++ b/
common/cli.c
@@
-28,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.
@@
-55,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
/*
@@
-79,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
@@
-94,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
/*
@@
-214,7
+214,7
@@
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 (;;);
@@
-222,12
+222,12
@@
void cli_loop(void)
cli_simple_loop();
#else
printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");
cli_simple_loop();
#else
printf("## U-Boot command line is disabled. Please enable CONFIG_CMDLINE\n");
-#endif /*CONFIG_
SYS_
HUSH_PARSER*/
+#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