mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
hush: complete renaming CONFIG_SYS_HUSH_PARSER to CONFIG_HUSH_PARSER
There is no more define of CONFIG_SYS_HUSH_PARSER. Rename some remaining references and drop the backward compatible Kconfig entry. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
committed by
Tom Rini
parent
b88d6f7614
commit
f1f9d4fac5
14
common/cli.c
14
common/cli.c
@@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
*/
|
||||
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.
|
||||
@@ -55,7 +55,7 @@ int run_command(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
|
||||
/*
|
||||
@@ -79,7 +79,7 @@ int run_command_list(const char *cmd, int len, int flag)
|
||||
|
||||
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
|
||||
@@ -94,7 +94,7 @@ int run_command_list(const char *cmd, int len, int flag)
|
||||
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
|
||||
/*
|
||||
@@ -214,7 +214,7 @@ err:
|
||||
|
||||
void cli_loop(void)
|
||||
{
|
||||
#ifdef CONFIG_SYS_HUSH_PARSER
|
||||
#ifdef CONFIG_HUSH_PARSER
|
||||
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");
|
||||
#endif /*CONFIG_SYS_HUSH_PARSER*/
|
||||
#endif /*CONFIG_HUSH_PARSER*/
|
||||
}
|
||||
|
||||
void cli_init(void)
|
||||
{
|
||||
#ifdef CONFIG_SYS_HUSH_PARSER
|
||||
#ifdef CONFIG_HUSH_PARSER
|
||||
u_boot_hush_start();
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user