cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2

Move CONFIG_SYS_PROMPT_HUSH_PS2 in Kconfig, depending
on CONFIG_HUSH_PARSER, and remove the default value defined
in cli_hush.c under __U_BOOT__.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Patrick Delaunay 2020-10-26 09:31:42 +01:00 committed by Tom Rini
parent 310f285e78
commit 48aee0afb6
4 changed files with 9 additions and 11 deletions

7
README
View File

@ -1925,13 +1925,6 @@ The following options need to be configured:
try longer timeout such as try longer timeout such as
#define CONFIG_NFS_TIMEOUT 10000UL #define CONFIG_NFS_TIMEOUT 10000UL
- Command Interpreter:
CONFIG_SYS_PROMPT_HUSH_PS2
This defines the secondary prompt string, which is
printed when the command interpreter needs more input
to complete a command. Usually "> ".
Note: Note:
In the current implementation, the local variables In the current implementation, the local variables

View File

@ -55,6 +55,15 @@ config SYS_PROMPT
This string is displayed in the command line to the left of the This string is displayed in the command line to the left of the
cursor. cursor.
config SYS_PROMPT_HUSH_PS2
string "Hush shell secondary prompt"
depends on HUSH_PARSER
default "> "
help
This defines the secondary prompt string, which is
printed when the command interpreter needs more input
to complete a command. Usually "> ".
config SYS_XTRACE config SYS_XTRACE
string "Command execution tracer" string "Command execution tracer"
depends on CMDLINE depends on CMDLINE

View File

@ -84,9 +84,6 @@
#include <cli.h> #include <cli.h>
#include <cli_hush.h> #include <cli_hush.h>
#include <command.h> /* find_cmd */ #include <command.h> /* find_cmd */
#ifndef CONFIG_SYS_PROMPT_HUSH_PS2
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#endif
#endif #endif
#ifndef __U_BOOT__ #ifndef __U_BOOT__
#include <ctype.h> /* isalpha, isdigit */ #include <ctype.h> /* isalpha, isdigit */

View File

@ -3508,7 +3508,6 @@ CONFIG_SYS_POST_WATCHDOG
CONFIG_SYS_POST_WORD_ADDR CONFIG_SYS_POST_WORD_ADDR
CONFIG_SYS_PPC_DDR_WIMGE CONFIG_SYS_PPC_DDR_WIMGE
CONFIG_SYS_PQSPAR CONFIG_SYS_PQSPAR
CONFIG_SYS_PROMPT_HUSH_PS2
CONFIG_SYS_PSDPAR CONFIG_SYS_PSDPAR
CONFIG_SYS_PSSR_VAL CONFIG_SYS_PSSR_VAL
CONFIG_SYS_PTCPAR CONFIG_SYS_PTCPAR