From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Delaunay Date: Mon, 26 Oct 2020 09:31:42 +0100 Subject: [PATCH 2/2] cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2 In-Reply-To: <20201026083142.6395-1-patrick.delaunay@st.com> References: <20201026083142.6395-1-patrick.delaunay@st.com> Message-ID: <20201026083142.6395-2-patrick.delaunay@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- README | 7 ------- cmd/Kconfig | 9 +++++++++ common/cli_hush.c | 3 --- scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/README b/README index df824b67e7..8338e5ec21 100644 --- a/README +++ b/README @@ -1927,13 +1927,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 a3166e4f31..2c427d77b8 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 5b1f119074..79664aad58 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -84,9 +84,6 @@ #include #include #include /* find_cmd */ -#ifndef CONFIG_SYS_PROMPT_HUSH_PS2 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif #endif #ifndef __U_BOOT__ #include /* isalpha, isdigit */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index dc4f0b050c..7b5093fbfd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3512,7 +3512,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 -- 2.17.1