Skip to contentSkip to conversation

hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files

PATCH New Patrick Delaunay 4 participants 5 messages Oct 26, 2020 – Dec 2, 2020 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files

There is no reason to define default option for this macro which is already done in common/cli_hush.c.

87 #ifndef CONFIG_SYS_PROMPT_HUSH_PS2
88 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
89 #endif

---

see previous patches:

http://patchwork.ozlabs.org/project/uboot/patch/11b23b65581253f10905bcefc923aacb3c2ce85a.1529647987.git.michal.simek at xilinx.com/
https://lists.denx.de/pipermail/u-boot/2012-June/126510.html

 include/configs/apalis-imx8.h     | 1 -
 include/configs/colibri-imx8x.h   | 1 -
 include/configs/imx8mm_beacon.h   | 1 -
 include/configs/imx8mm_evk.h      | 1 -
 include/configs/imx8mn_evk.h      | 1 -
 include/configs/imx8mp_evk.h      | 1 -
 include/configs/imx8mq_evk.h      | 1 -
 include/configs/imx8mq_phanbell.h | 1 -
 include/configs/s5p4418_nanopi2.h | 4 ----
 include/configs/verdin-imx8mm.h   | 1 -
 include/configs/xenguest_arm64.h  | 1 -
 11 files changed, 14 deletions(-)
include/configs/apalis-imx8.h +0 -1
index db4e9011c0..b474b2f522 100644
@@ -98,7 +98,6 @@
 #define PHYS_SDRAM_2_SIZE		SZ_2G		/* 2 GB */
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		SZ_2K
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/colibri-imx8x.h +0 -1
index 29a37ed44f..fc2c191594 100644
@@ -132,7 +132,6 @@
 #define PHYS_SDRAM_2_SIZE		0x00000000	/* 0 GB */
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		SZ_2K
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mm_beacon.h +0 -1
index 3c9541187f..9a93dba1c5 100644
@@ -119,7 +119,6 @@
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		2048
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mm_evk.h +0 -1
index 83521ad401..92eb85553e 100644
@@ -120,7 +120,6 @@
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		2048
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mn_evk.h +0 -1
index a6333085fe..cda8fc2ef7 100644
@@ -124,7 +124,6 @@
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		2048
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mp_evk.h +0 -1
index 8253c6aa2f..92091dfd6b 100644
@@ -135,7 +135,6 @@
 #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		2048
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
include/configs/imx8mq_evk.h +0 -1
index 3f9a3bc100..96bfff749c 100644
@@ -175,7 +175,6 @@
 /* Monitor Command Prompt */
 #undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT		"u-boot=> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mq_phanbell.h +0 -1
index e8b65a4ba5..66c2c3a8d8 100644
@@ -169,7 +169,6 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/s5p4418_nanopi2.h +0 -4
index 6dd1f3bc04..1e2180b970 100644
@@ -102,10 +102,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#ifdef CONFIG_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
-
 /*-----------------------------------------------------------------------
  * Etc Command definition
  */
include/configs/verdin-imx8mm.h +0 -1
index fd8405433d..4751bf5a5a 100644
@@ -98,7 +98,6 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_CBSIZE		SZ_2K
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/xenguest_arm64.h +0 -1
index c44381e966..d76ce13d14 100644
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MALLOC_LEN         (32 * 1024 * 1024)
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
 #define CONFIG_SYS_CBSIZE             1024
 #define CONFIG_SYS_MAXARGS            64
 #define CONFIG_SYS_BARGSIZE           CONFIG_SYS_CBSIZE
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 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__.

---

 README                       | 7 -------
 cmd/Kconfig                  | 9 +++++++++
 common/cli_hush.c            | 3 ---
 scripts/config_whitelist.txt | 1 -
 4 files changed, 9 insertions(+), 11 deletions(-)
README +0 -7
index df824b67e7..8338e5ec21 100644
@@ -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
cmd/Kconfig +9 -0
index a3166e4f31..2c427d77b8 100644
@@ -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
common/cli_hush.c +0 -3
index 5b1f119074..79664aad58 100644
@@ -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 */
scripts/config_whitelist.txt +0 -1
index dc4f0b050c..7b5093fbfd 100644
@@ -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
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2

Quoted 5 lines · Patrick Delaunay

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__.

Quoted 8 lines

---

 README                       | 7 -------
 cmd/Kconfig                  | 9 +++++++++
 common/cli_hush.c            | 3 ---
 scripts/config_whitelist.txt | 1 -
 4 files changed, 9 insertions(+), 11 deletions(-)
#3 lore raw

PATCH 2/2 cmd: Kconfig: migrate CONFIG_SYS_PROMPT_HUSH_PS2

In reply to Patrick Delaunay
Quoted 6 lines · Patrick Delaunay

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__.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201202/0d2aa218/attachment.sig>
#4 lore raw

PATCH 1/2 hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files

In reply to Patrick Delaunay

Hi,

Quoted 8 lines · Patrick Delaunay

There is no reason to define default option for this macro which is already done in common/cli_hush.c.

87 #ifndef CONFIG_SYS_PROMPT_HUSH_PS2
88 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
89 #endif

For the Xen bits:

Thank you,

Oleksandr

Quoted 156 lines

---

see previous patches:

https://urldefense.com/v3/__http://patchwork.ozlabs.org/project/uboot/patch/11b23b65581253f10905bcefc923aacb3c2ce85a.1529647987.git.michal.simek at xilinx.com/__;!!GF_29dbcQIUBPA!kuAr0IR41fGK-arwjDJjvrgCPSun2J2QhGuqL3jeWOp_bGAsPKrocOHClsfQvvlGete5ostLcw$ [patchwork[.]ozlabs[.]org]

https://urldefense.com/v3/__https://lists.denx.de/pipermail/u-boot/2012-June/126510.html__;!!GF_29dbcQIUBPA!kuAr0IR41fGK-arwjDJjvrgCPSun2J2QhGuqL3jeWOp_bGAsPKrocOHClsfQvvlGetdcg8yzLQ$ [lists[.]denx[.]de]
  include/configs/apalis-imx8.h     | 1 -
  include/configs/colibri-imx8x.h   | 1 -
  include/configs/imx8mm_beacon.h   | 1 -
  include/configs/imx8mm_evk.h      | 1 -
  include/configs/imx8mn_evk.h      | 1 -
  include/configs/imx8mp_evk.h      | 1 -
  include/configs/imx8mq_evk.h      | 1 -
  include/configs/imx8mq_phanbell.h | 1 -
  include/configs/s5p4418_nanopi2.h | 4 ----
  include/configs/verdin-imx8mm.h   | 1 -
  include/configs/xenguest_arm64.h  | 1 -
  11 files changed, 14 deletions(-)
include/configs/apalis-imx8.h +0 -1
index db4e9011c0..b474b2f522 100644
@@ -98,7 +98,6 @@
  #define PHYS_SDRAM_2_SIZE		SZ_2G		/* 2 GB */
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		SZ_2K
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/colibri-imx8x.h +0 -1
index 29a37ed44f..fc2c191594 100644
@@ -132,7 +132,6 @@
  #define PHYS_SDRAM_2_SIZE		0x00000000	/* 0 GB */
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		SZ_2K
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mm_beacon.h +0 -1
index 3c9541187f..9a93dba1c5 100644
@@ -119,7 +119,6 @@
  #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		2048
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mm_evk.h +0 -1
index 83521ad401..92eb85553e 100644
@@ -120,7 +120,6 @@
  #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		2048
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mn_evk.h +0 -1
index a6333085fe..cda8fc2ef7 100644
@@ -124,7 +124,6 @@
  #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		2048
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mp_evk.h +0 -1
index 8253c6aa2f..92091dfd6b 100644
@@ -135,7 +135,6 @@
  #define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		2048
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
include/configs/imx8mq_evk.h +0 -1
index 3f9a3bc100..96bfff749c 100644
@@ -175,7 +175,6 @@
  /* Monitor Command Prompt */
  #undef CONFIG_SYS_PROMPT
  #define CONFIG_SYS_PROMPT		"u-boot=> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		1024
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/imx8mq_phanbell.h +0 -1
index e8b65a4ba5..66c2c3a8d8 100644
@@ -169,7 +169,6 @@
  #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		1024
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/s5p4418_nanopi2.h +0 -4
index 6dd1f3bc04..1e2180b970 100644
@@ -102,10 +102,6 @@
  /* Boot Argument Buffer Size */
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#ifdef CONFIG_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#endif
-
  /*-----------------------------------------------------------------------
   * Etc Command definition
   */
include/configs/verdin-imx8mm.h +0 -1
index fd8405433d..4751bf5a5a 100644
@@ -98,7 +98,6 @@
  #define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
  #define CONFIG_SYS_CBSIZE		SZ_2K
  #define CONFIG_SYS_MAXARGS		64
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
include/configs/xenguest_arm64.h +0 -1
index c44381e966..d76ce13d14 100644
@@ -27,7 +27,6 @@
  #define CONFIG_SYS_MALLOC_LEN         (32 * 1024 * 1024)
 
  /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
  #define CONFIG_SYS_CBSIZE             1024
  #define CONFIG_SYS_MAXARGS            64
  #define CONFIG_SYS_BARGSIZE           CONFIG_SYS_CBSIZE