From: Patrick Delaunay <patrick.delaunay@st.com>
To: u-boot@lists.denx.de
Subject: [PATCH 2/2] cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2
Date: Mon, 26 Oct 2020 09:31:42 +0100 [thread overview]
Message-ID: <20201026083142.6395-2-patrick.delaunay@st.com> (raw)
In-Reply-To: <20201026083142.6395-1-patrick.delaunay@st.com>
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>
---
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 <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 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
next prev parent reply other threads:[~2020-10-26 8:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 8:31 [PATCH 1/2] hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files Patrick Delaunay
2020-10-26 8:31 ` Patrick Delaunay [this message]
2020-10-28 2:10 ` [PATCH 2/2] cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2 Simon Glass
2020-12-02 21:21 ` Tom Rini
2020-10-26 8:35 ` [PATCH 1/2] hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files Oleksandr Andrushchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026083142.6395-2-patrick.delaunay@st.com \
--to=patrick.delaunay@st.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.