diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2020-10-26 09:31:42 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-01 14:12:28 -0500 |
| commit | 48aee0afb62ee4ce11dd882600cfbcda60efb563 (patch) | |
| tree | 16264d1217e152b56a99b65acfd698ce34ea4e56 | |
| parent | 310f285e788dbc77fe804261ff5d016cd56ad523 (diff) | |
| download | u-boot-48aee0afb62ee4ce11dd882600cfbcda60efb563.tar.gz | |
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>
| -rw-r--r-- | README | 7 | ||||
| -rw-r--r-- | cmd/Kconfig | 9 | ||||
| -rw-r--r-- | common/cli_hush.c | 3 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
4 files changed, 9 insertions, 11 deletions
@@ -1925,13 +1925,6 @@ The following options need to be configured: try longer timeout such as #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: In the current implementation, the local variables diff --git a/cmd/Kconfig b/cmd/Kconfig index 1595de999b..98cf543ead 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -55,6 +55,15 @@ config SYS_PROMPT This string is displayed in the command line to the left of the 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 string "Command execution tracer" depends on CMDLINE diff --git a/common/cli_hush.c b/common/cli_hush.c index 66995c255b..b7f0f0ff41 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -84,9 +84,6 @@ #include <cli.h> #include <cli_hush.h> #include <command.h> /* find_cmd */ -#ifndef CONFIG_SYS_PROMPT_HUSH_PS2 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif #endif #ifndef __U_BOOT__ #include <ctype.h> /* isalpha, isdigit */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8b4fcba395..31acc36d4c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3508,7 +3508,6 @@ CONFIG_SYS_POST_WATCHDOG CONFIG_SYS_POST_WORD_ADDR CONFIG_SYS_PPC_DDR_WIMGE CONFIG_SYS_PQSPAR -CONFIG_SYS_PROMPT_HUSH_PS2 CONFIG_SYS_PSDPAR CONFIG_SYS_PSSR_VAL CONFIG_SYS_PTCPAR |