From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 13/20] # This is a combination of 2 commits. # This is the 1st commit message:
Date: Sun, 7 Nov 2021 22:59:44 -0500 [thread overview]
Message-ID: <20211108035951.3580952-13-trini@konsulko.com> (raw)
In-Reply-To: <20211108035951.3580952-1-trini@konsulko.com>
Convert CONFIG_SYS_PROMPT et al to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_PROMPT
CONFIG_SYS_PROMPT_HUSH_PS2
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/imx8mq_evk_defconfig | 1 +
configs/s5p4418_nanopi2_defconfig | 1 +
include/configs/apalis-imx8x.h | 1 -
include/configs/imx8mm-cl-iot-gate.h | 1 -
include/configs/imx8mm_venice.h | 1 -
include/configs/imx8mn_beacon.h | 1 -
include/configs/imx8mq_evk.h | 2 --
include/configs/imx8ulp_evk.h | 1 -
include/configs/mx7ulp_evk.h | 1 -
include/configs/octeontx2_common.h | 3 ---
include/configs/octeontx_common.h | 3 ---
include/configs/s5p4418_nanopi2.h | 9 ---------
12 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
index b02d9c1d758a..cf6068c0f4d8 100644
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -30,6 +30,7 @@ CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_I2C=y
CONFIG_SPL_POWER=y
CONFIG_SPL_WATCHDOG=y
+CONFIG_SYS_PROMPT="u-boot=> "
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_CMD_EXPORTENV is not set
# CONFIG_CMD_IMPORTENV is not set
diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig
index eaf319e58a2a..fa59cfd06923 100644
--- a/configs/s5p4418_nanopi2_defconfig
+++ b/configs/s5p4418_nanopi2_defconfig
@@ -25,6 +25,7 @@ CONFIG_BOOTDELAY=1
CONFIG_ARCH_MISC_INIT=y
CONFIG_BOARD_LATE_INIT=y
CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="nanopi2# "
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_GPIO=y
diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index 5b00a3c7e0b9..50dae2d8e05a 100644
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -113,7 +113,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
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index caab69ab2ae4..6868b8048499 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -157,7 +157,6 @@
#define CONFIG_MXC_UART_BASE UART3_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
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 63f02bfd01e8..f8d41425c6fa 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -96,7 +96,6 @@
#define CONFIG_MXC_UART_BASE UART2_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
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index b027bea5b544..f89836cd2a8b 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -127,7 +127,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
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 464c0c3db059..fa1f29f27434 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -93,8 +93,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR
/* Monitor Command Prompt */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "u-boot=> "
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 90a8fa72f1f5..501f465b9e75 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -81,7 +81,6 @@
#define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */
/* 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
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 6d7f09e2885e..4046c3fbf732 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -26,7 +26,6 @@
#define LPUART_BASE LPUART4_RBASE
/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "=> "
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 256
diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index c64134792df1..6f3e2cae937c 100644
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -42,9 +42,6 @@
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT env_get("prompt")
-
#if defined(CONFIG_MMC_OCTEONTX)
#define MMC_SUPPORTS_TUNING
/** EMMC specific defines */
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 26b3add722b7..46908be32a39 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -75,9 +75,6 @@
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT env_get("prompt")
-
/** EMMC specific defines */
#if defined(CONFIG_MMC_OCTEONTX)
#define CONFIG_SUPPORT_EMMC_RPMB
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index d22a84a50352..2e94613c37a4 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -78,15 +78,6 @@
*/
/* board_init_f->init_sequence, call arch_cpu_init */
-/*-----------------------------------------------------------------------
- * Miscellaneous configurable options
- */
-#ifdef CONFIG_SYS_PROMPT
-#undef CONFIG_SYS_PROMPT
-/* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT "nanopi2# "
-#endif
-
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024
/* Print Buffer Size */
--
2.25.1
next prev parent reply other threads:[~2021-11-08 4:02 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 3:59 [PATCH 01/20] Convert CONFIG_ARCH_CPU_INIT to Kconfig Tom Rini
2021-11-08 3:59 ` [PATCH 02/20] Convert CONFIG_E1000 " Tom Rini
2021-11-13 0:02 ` Tom Rini
2021-11-08 3:59 ` [PATCH 03/20] Convert CONFIG_DOS_PARTITION " Tom Rini
2021-11-13 0:02 ` Tom Rini
2021-11-08 3:59 ` [PATCH 04/20] Convert CONFIG_BITBANGMII " Tom Rini
2021-11-13 0:02 ` Tom Rini
2021-11-08 3:59 ` [PATCH 05/20] Convert CONFIG_FSL_LAYERSCAPE " Tom Rini
2021-11-13 0:02 ` Tom Rini
2021-11-08 3:59 ` [PATCH 06/20] Convert CONFIG_FSL_USDHC " Tom Rini
2021-11-13 0:02 ` Tom Rini
2021-11-08 3:59 ` [PATCH 07/20] Convert CONFIG_ENV_IS_IN_SPI_FLASH et al " Tom Rini
2021-11-13 0:02 ` Tom Rini
2021-11-08 3:59 ` [PATCH 08/20] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 09/20] Convert CONFIG_TRACE et al " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 10/20] Convert CONFIG_MISC_INIT_F " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 11/20] Convert CONFIG_PHYLIB " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 12/20] Convert CONFIG_I2C_EDID " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` Tom Rini [this message]
2021-11-08 15:33 ` [PATCH 13/20] # This is a combination of 2 commits. # This is the 1st commit message: Tom Rini
2021-11-13 0:03 ` [PATCH 13/20] Convert CONFIG_SYS_PROMPT et al to Kconfig Tom Rini
2021-11-08 3:59 ` [PATCH 14/20] Convert CONFIG_IMX_BOOTAUX " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 15/20] Convert CONFIG_MX6 " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 16/20] Convert CONFIG_MD5 " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 17/20] Convert CONFIG_MACB " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 18/20] Convert CONFIG_PL011_SERIAL et al " Tom Rini
2021-11-13 0:03 ` Tom Rini
2021-11-08 3:59 ` [PATCH 19/20] Remove CONFIG_SERIAL_MULTI Tom Rini
2021-11-13 0:04 ` Tom Rini
2021-11-08 3:59 ` [PATCH 20/20] Convert CONFIG_LAST_STAGE_INIT to Kconfig Tom Rini
2021-11-13 0:04 ` Tom Rini
2021-11-13 0:02 ` [PATCH 01/20] Convert CONFIG_ARCH_CPU_INIT " Tom Rini
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=20211108035951.3580952-13-trini@konsulko.com \
--to=trini@konsulko.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox