Message ID | 20201026083142.6395-1-patrick.delaunay@st.com |
---|---|
State | Accepted |
Commit | 310f285e788dbc77fe804261ff5d016cd56ad523 |
Delegated to: | Tom Rini |
Headers | show |
Series | [1/2] hush: Remove default CONFIG_SYS_PROMPT_HUSH_PS2 setting from board files | expand |
Hi, On 10/26/20 10:31 AM, Patrick Delaunay wrote: > 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 > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> For the Xen bits: Acked-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Thank you, Oleksandr > --- > > see previous patches: > > https://urldefense.com/v3/__http://patchwork.ozlabs.org/project/uboot/patch/11b23b65581253f10905bcefc923aacb3c2ce85a.1529647987.git.michal.simek@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(-) > > diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h > index db4e9011c0..b474b2f522 100644 > --- a/include/configs/apalis-imx8.h > +++ b/include/configs/apalis-imx8.h > @@ -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 > diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h > index 29a37ed44f..fc2c191594 100644 > --- a/include/configs/colibri-imx8x.h > +++ b/include/configs/colibri-imx8x.h > @@ -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 > diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h > index 3c9541187f..9a93dba1c5 100644 > --- a/include/configs/imx8mm_beacon.h > +++ b/include/configs/imx8mm_beacon.h > @@ -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 > diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h > index 83521ad401..92eb85553e 100644 > --- a/include/configs/imx8mm_evk.h > +++ b/include/configs/imx8mm_evk.h > @@ -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 > diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h > index a6333085fe..cda8fc2ef7 100644 > --- a/include/configs/imx8mn_evk.h > +++ b/include/configs/imx8mn_evk.h > @@ -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 > diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h > index 8253c6aa2f..92091dfd6b 100644 > --- a/include/configs/imx8mp_evk.h > +++ b/include/configs/imx8mp_evk.h > @@ -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 > diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h > index 3f9a3bc100..96bfff749c 100644 > --- a/include/configs/imx8mq_evk.h > +++ b/include/configs/imx8mq_evk.h > @@ -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 > diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h > index e8b65a4ba5..66c2c3a8d8 100644 > --- a/include/configs/imx8mq_phanbell.h > +++ b/include/configs/imx8mq_phanbell.h > @@ -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 > diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h > index 6dd1f3bc04..1e2180b970 100644 > --- a/include/configs/s5p4418_nanopi2.h > +++ b/include/configs/s5p4418_nanopi2.h > @@ -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 > */ > diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h > index fd8405433d..4751bf5a5a 100644 > --- a/include/configs/verdin-imx8mm.h > +++ b/include/configs/verdin-imx8mm.h > @@ -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 > diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h > index c44381e966..d76ce13d14 100644 > --- a/include/configs/xenguest_arm64.h > +++ b/include/configs/xenguest_arm64.h > @@ -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
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index db4e9011c0..b474b2f522 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -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 diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 29a37ed44f..fc2c191594 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -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 diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 3c9541187f..9a93dba1c5 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -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 diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 83521ad401..92eb85553e 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -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 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index a6333085fe..cda8fc2ef7 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -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 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 8253c6aa2f..92091dfd6b 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -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 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 3f9a3bc100..96bfff749c 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -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 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index e8b65a4ba5..66c2c3a8d8 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -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 diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index 6dd1f3bc04..1e2180b970 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -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 */ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index fd8405433d..4751bf5a5a 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -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 diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h index c44381e966..d76ce13d14 100644 --- a/include/configs/xenguest_arm64.h +++ b/include/configs/xenguest_arm64.h @@ -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
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 Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- see previous patches: http://patchwork.ozlabs.org/project/uboot/patch/11b23b65581253f10905bcefc923aacb3c2ce85a.1529647987.git.michal.simek@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(-)