[PATCH 04/25] Convert CONFIG_CMDLINE_PS_SUPPORT to Kconfig

Tom Rini trini at konsulko.com
Thu Mar 31 00:07:14 CEST 2022


This converts the following to Kconfig:
   CONFIG_CMDLINE_PS_SUPPORT

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 README                                | 8 --------
 cmd/Kconfig                           | 7 +++++++
 configs/socfpga_vining_fpga_defconfig | 1 +
 include/configs/socfpga_vining_fpga.h | 3 ---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 04e3fad0b8b6..6273a7f3673e 100644
--- a/README
+++ b/README
@@ -1532,14 +1532,6 @@ The following options need to be configured:
 		of the backslashes before semicolons and special
 		symbols.
 
-- Command Line Editing and History:
-		CONFIG_CMDLINE_PS_SUPPORT
-
-		Enable support for changing the command prompt string
-		at run-time. Only static string is supported so far.
-		The string is obtained from environment variables PS1
-		and PS2.
-
 - Default Environment:
 		CONFIG_EXTRA_ENV_SETTINGS
 
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1d8401236fb3..0065d670dc45 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -31,6 +31,13 @@ config CMDLINE_EDITING
 	  Enable editing and History functions for interactive command line
 	  input operations
 
+config CMDLINE_PS_SUPPORT
+	bool "Enable support for changing the command prompt string at run-time"
+	depends on HUSH_PARSER
+	help
+	  Only static string in the prompt is supported so far.  The string is
+	  obtained from environment variables PS1 and PS2.
+
 config AUTO_COMPLETE
 	bool "Enable auto complete using TAB"
 	depends on CMDLINE
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index 52084b8f2a5d..331975ad3097 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -27,6 +27,7 @@ CONFIG_CLOCKS=y
 CONFIG_MISC_INIT_R=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
+CONFIG_CMDLINE_PS_SUPPORT=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 2d4ce3ce44b5..500657d0a577 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -186,9 +186,6 @@
 		"fi\0"							\
 		"socfpga_legacy_reset_compat=1\0"
 
-/* Support changing the prompt string */
-#define CONFIG_CMDLINE_PS_SUPPORT
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
-- 
2.25.1



More information about the U-Boot mailing list