From 99e6feb23c93aeae80a2387623df33e9e5575a87 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 7 Nov 2021 22:59:44 -0500 Subject: [PATCH] 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 --- 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 b02d9c1d75..cf6068c0f4 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 eaf319e58a..fa59cfd069 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 5b00a3c7e0..50dae2d8e0 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 caab69ab2a..6868b80484 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 63f02bfd01..f8d41425c6 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 b027bea5b5..f89836cd2a 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 464c0c3db0..fa1f29f274 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 90a8fa72f1..501f465b9e 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 6d7f09e288..4046c3fbf7 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 c64134792d..6f3e2cae93 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 26b3add722..46908be32a 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 d22a84a503..2e94613c37 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.39.5