| Message ID | e3280508945905e221d3cea99bf05df309503e2c.1569407879.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 3c3886d75bd314ec3fe333abe16e99cd76829648 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | [U-Boot,1/2] ARM: zynq: Define default SYS_PROMPT | expand |
Hi Michal, On 25/09/19 12:38, Michal Simek wrote: > All boards are using the same prompt that's why add it as default value to > Kconfig to simplify defconfigs. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > cmd/Kconfig | 1 + > configs/avnet_ultra96_rev1_defconfig | 1 - > configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - > configs/xilinx_zynqmp_a2197_g_revA_defconfig | 1 - > configs/xilinx_zynqmp_a2197_m_revA_defconfig | 1 - > configs/xilinx_zynqmp_a2197_p_revA_defconfig | 1 - > configs/xilinx_zynqmp_a2197_revA_defconfig | 1 - > configs/xilinx_zynqmp_mini_defconfig | 1 - > configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - > configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - > configs/xilinx_zynqmp_mini_nand_defconfig | 1 - > configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - > configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - > configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 - > configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 - > configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - > configs/xilinx_zynqmp_zcu106_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu111_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu1275_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu1275_revB_defconfig | 1 - > 29 files changed, 1 insertion(+), 28 deletions(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index ab65f87999dc..65360a69beb6 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -49,6 +49,7 @@ config SYS_LONGHELP > config SYS_PROMPT > string "Shell prompt" > default "Zynq> " if ARCH_ZYNQ > + default "ZynqMP> " if ARCH_ZYNQMP > default "=> " Generally speaking, why do we need a per-machine prompt at all? "=> " ought be enough for everybody, nope? However to maintain backward compatibility with whatever expects those prompts this patch is a good cleanup anyway: Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
On 25. 09. 19 13:03, Luca Ceresoli wrote: > Hi Michal, > > On 25/09/19 12:38, Michal Simek wrote: >> All boards are using the same prompt that's why add it as default value to >> Kconfig to simplify defconfigs. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> --- >> >> cmd/Kconfig | 1 + >> configs/avnet_ultra96_rev1_defconfig | 1 - >> configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - >> configs/xilinx_zynqmp_a2197_g_revA_defconfig | 1 - >> configs/xilinx_zynqmp_a2197_m_revA_defconfig | 1 - >> configs/xilinx_zynqmp_a2197_p_revA_defconfig | 1 - >> configs/xilinx_zynqmp_a2197_revA_defconfig | 1 - >> configs/xilinx_zynqmp_mini_defconfig | 1 - >> configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - >> configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - >> configs/xilinx_zynqmp_mini_nand_defconfig | 1 - >> configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - >> configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - >> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - >> configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - >> configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 - >> configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 - >> configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 - >> configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 - >> configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 - >> configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - >> configs/xilinx_zynqmp_zcu106_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zcu111_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zcu1275_revA_defconfig | 1 - >> configs/xilinx_zynqmp_zcu1275_revB_defconfig | 1 - >> 29 files changed, 1 insertion(+), 28 deletions(-) >> >> diff --git a/cmd/Kconfig b/cmd/Kconfig >> index ab65f87999dc..65360a69beb6 100644 >> --- a/cmd/Kconfig >> +++ b/cmd/Kconfig >> @@ -49,6 +49,7 @@ config SYS_LONGHELP >> config SYS_PROMPT >> string "Shell prompt" >> default "Zynq> " if ARCH_ZYNQ >> + default "ZynqMP> " if ARCH_ZYNQMP >> default "=> " > > Generally speaking, why do we need a per-machine prompt at all? > "=> " ought be enough for everybody, nope? > > However to maintain backward compatibility with whatever expects those > prompts this patch is a good cleanup anyway: > > Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Lava for example is looking for certain string in prompt that's why we should keep backward compatibility as you mentioned. M
st 25. 9. 2019 v 12:38 odesÃlatel Michal Simek <michal.simek@xilinx.com> napsal: > > All boards are using the same prompt that's why add it as default value to > Kconfig to simplify defconfigs. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > cmd/Kconfig | 1 + > configs/avnet_ultra96_rev1_defconfig | 1 - > configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - > configs/xilinx_zynqmp_a2197_g_revA_defconfig | 1 - > configs/xilinx_zynqmp_a2197_m_revA_defconfig | 1 - > configs/xilinx_zynqmp_a2197_p_revA_defconfig | 1 - > configs/xilinx_zynqmp_a2197_revA_defconfig | 1 - > configs/xilinx_zynqmp_mini_defconfig | 1 - > configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - > configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - > configs/xilinx_zynqmp_mini_nand_defconfig | 1 - > configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - > configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - > configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 - > configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 - > configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - > configs/xilinx_zynqmp_zcu106_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu111_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu1275_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu1275_revB_defconfig | 1 - > 29 files changed, 1 insertion(+), 28 deletions(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index ab65f87999dc..65360a69beb6 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -49,6 +49,7 @@ config SYS_LONGHELP > config SYS_PROMPT > string "Shell prompt" > default "Zynq> " if ARCH_ZYNQ > + default "ZynqMP> " if ARCH_ZYNQMP > default "=> " > help > This string is displayed in the command line to the left of the > diff --git a/configs/avnet_ultra96_rev1_defconfig b/configs/avnet_ultra96_rev1_defconfig > index 924153081149..b5e61e621acd 100644 > --- a/configs/avnet_ultra96_rev1_defconfig > +++ b/configs/avnet_ultra96_rev1_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_BOOTMENU=y > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_BIND=y > diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > index f463318565ff..b9bb0c9b1112 100644 > --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > @@ -16,7 +16,6 @@ CONFIG_SPL_LOAD_FIT=y > CONFIG_BOOTDELAY=0 > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_SPL_OS_BOOT=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_FPGA_LOADBP=y > CONFIG_CMD_FPGA_LOADP=y > diff --git a/configs/xilinx_zynqmp_a2197_g_revA_defconfig b/configs/xilinx_zynqmp_a2197_g_revA_defconfig > index 2f6dc7641a80..47a98c6d4d8b 100644 > --- a/configs/xilinx_zynqmp_a2197_g_revA_defconfig > +++ b/configs/xilinx_zynqmp_a2197_g_revA_defconfig > @@ -21,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_a2197_m_revA_defconfig b/configs/xilinx_zynqmp_a2197_m_revA_defconfig > index d9107d6bb867..fb4020b2dfed 100644 > --- a/configs/xilinx_zynqmp_a2197_m_revA_defconfig > +++ b/configs/xilinx_zynqmp_a2197_m_revA_defconfig > @@ -21,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_a2197_p_revA_defconfig b/configs/xilinx_zynqmp_a2197_p_revA_defconfig > index 4ce634cdaacf..d19c6b34cac6 100644 > --- a/configs/xilinx_zynqmp_a2197_p_revA_defconfig > +++ b/configs/xilinx_zynqmp_a2197_p_revA_defconfig > @@ -22,7 +22,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_a2197_revA_defconfig b/configs/xilinx_zynqmp_a2197_revA_defconfig > index ace011423249..3498483f4b78 100644 > --- a/configs/xilinx_zynqmp_a2197_revA_defconfig > +++ b/configs/xilinx_zynqmp_a2197_revA_defconfig > @@ -21,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig > index 93fa7d8f6bdc..4b7fe5dd40e8 100644 > --- a/configs/xilinx_zynqmp_mini_defconfig > +++ b/configs/xilinx_zynqmp_mini_defconfig > @@ -13,7 +13,6 @@ CONFIG_ZYNQMP_PSU_INIT_ENABLED=y > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > # CONFIG_SYS_LONGHELP is not set > -CONFIG_SYS_PROMPT="ZynqMP> " > # CONFIG_AUTOBOOT is not set > # CONFIG_CMD_BDI is not set > # CONFIG_CMD_CONSOLE is not set > diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig > index b4162abdd715..282e93f03ca1 100644 > --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig > +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig > @@ -14,7 +14,6 @@ CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > -CONFIG_SYS_PROMPT="ZynqMP> " > # CONFIG_AUTOBOOT is not set > # CONFIG_CMD_BDI is not set > # CONFIG_CMD_CONSOLE is not set > diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig > index 76d5aa6c713b..be709886987b 100644 > --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig > +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig > @@ -14,7 +14,6 @@ CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > -CONFIG_SYS_PROMPT="ZynqMP> " > # CONFIG_AUTOBOOT is not set > # CONFIG_CMD_BDI is not set > # CONFIG_CMD_CONSOLE is not set > diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig > index 2b896f79a72e..35776ab20816 100644 > --- a/configs/xilinx_zynqmp_mini_nand_defconfig > +++ b/configs/xilinx_zynqmp_mini_nand_defconfig > @@ -14,7 +14,6 @@ CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > # CONFIG_SYS_LONGHELP is not set > -CONFIG_SYS_PROMPT="ZynqMP> " > # CONFIG_AUTOBOOT is not set > # CONFIG_CMD_BDI is not set > # CONFIG_CMD_CONSOLE is not set > diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig > index a20534a488ca..383f868625bf 100644 > --- a/configs/xilinx_zynqmp_mini_qspi_defconfig > +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig > @@ -17,7 +17,6 @@ CONFIG_ZYNQMP_NO_DDR=y > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > # CONFIG_SYS_LONGHELP is not set > -CONFIG_SYS_PROMPT="ZynqMP> " > # CONFIG_AUTOBOOT is not set > # CONFIG_CMD_BDI is not set > # CONFIG_CMD_CONSOLE is not set > diff --git a/configs/xilinx_zynqmp_zc1232_revA_defconfig b/configs/xilinx_zynqmp_zc1232_revA_defconfig > index 80a310fb1cee..255217df4bd8 100644 > --- a/configs/xilinx_zynqmp_zc1232_revA_defconfig > +++ b/configs/xilinx_zynqmp_zc1232_revA_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > # CONFIG_CMD_FLASH is not set > diff --git a/configs/xilinx_zynqmp_zc1254_revA_defconfig b/configs/xilinx_zynqmp_zc1254_revA_defconfig > index 75ec572827bf..e058195842f5 100644 > --- a/configs/xilinx_zynqmp_zc1254_revA_defconfig > +++ b/configs/xilinx_zynqmp_zc1254_revA_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > # CONFIG_CMD_FLASH is not set > diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > index ce1ea089ce8d..bbf387a6b072 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > @@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > index 01c29c0e70a3..d5434eee85a2 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > @@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > index 877f5b230da3..4ff52292fb68 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > CONFIG_CMD_DFU=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > index 6f14234a590e..a5a7fc2aeb0b 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > @@ -16,7 +16,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > CONFIG_CMD_CLK=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > index f1970aadf417..5b8cf77085d9 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > @@ -16,7 +16,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > CONFIG_CMD_CLK=y > diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig b/configs/xilinx_zynqmp_zcu100_revC_defconfig > index cd7d2f5376d2..fc917f0b5d2d 100644 > --- a/configs/xilinx_zynqmp_zcu100_revC_defconfig > +++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_BOOTMENU=y > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_BIND=y > diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > index 52ee2f2a0b04..b64956d5f6a3 100644 > --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > @@ -20,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig > index 2b7cab8add62..8b1a1ce0a2cf 100644 > --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > @@ -20,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig > index ce271b5a31ca..2aab26dd3fb0 100644 > --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > @@ -20,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_SYS_ALT_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_zcu104_revA_defconfig b/configs/xilinx_zynqmp_zcu104_revA_defconfig > index eacf75d9f8e2..07e58b192ab0 100644 > --- a/configs/xilinx_zynqmp_zcu104_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > CONFIG_CMD_DFU=y > diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig b/configs/xilinx_zynqmp_zcu104_revC_defconfig > index 2f269009dfe9..4829df62b410 100644 > --- a/configs/xilinx_zynqmp_zcu104_revC_defconfig > +++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig > @@ -20,7 +20,6 @@ CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > CONFIG_CMD_DFU=y > diff --git a/configs/xilinx_zynqmp_zcu106_revA_defconfig b/configs/xilinx_zynqmp_zcu106_revA_defconfig > index 1b685ca04925..72b3ce16a884 100644 > --- a/configs/xilinx_zynqmp_zcu106_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig > @@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_THOR_DOWNLOAD=y > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > diff --git a/configs/xilinx_zynqmp_zcu111_revA_defconfig b/configs/xilinx_zynqmp_zcu111_revA_defconfig > index 74106d7ea8fa..de739ed3b5f1 100644 > --- a/configs/xilinx_zynqmp_zcu111_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > CONFIG_CMD_DFU=y > diff --git a/configs/xilinx_zynqmp_zcu1275_revA_defconfig b/configs/xilinx_zynqmp_zcu1275_revA_defconfig > index b9110ca3b936..d86c5d1a76a6 100644 > --- a/configs/xilinx_zynqmp_zcu1275_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu1275_revA_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > # CONFIG_CMD_FLASH is not set > diff --git a/configs/xilinx_zynqmp_zcu1275_revB_defconfig b/configs/xilinx_zynqmp_zcu1275_revB_defconfig > index 03372c77e637..957b883abde2 100644 > --- a/configs/xilinx_zynqmp_zcu1275_revB_defconfig > +++ b/configs/xilinx_zynqmp_zcu1275_revB_defconfig > @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > CONFIG_SPL_ATF=y > -CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > CONFIG_CMD_CLK=y > # CONFIG_CMD_FLASH is not set > -- > 2.17.1 > Applied both. M
diff --git a/cmd/Kconfig b/cmd/Kconfig index ab65f87999dc..65360a69beb6 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -49,6 +49,7 @@ config SYS_LONGHELP config SYS_PROMPT string "Shell prompt" default "Zynq> " if ARCH_ZYNQ + default "ZynqMP> " if ARCH_ZYNQMP default "=> " help This string is displayed in the command line to the left of the diff --git a/configs/avnet_ultra96_rev1_defconfig b/configs/avnet_ultra96_rev1_defconfig index 924153081149..b5e61e621acd 100644 --- a/configs/avnet_ultra96_rev1_defconfig +++ b/configs/avnet_ultra96_rev1_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_BIND=y diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index f463318565ff..b9bb0c9b1112 100644 --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig @@ -16,7 +16,6 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_BOOTDELAY=0 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_OS_BOOT=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADP=y diff --git a/configs/xilinx_zynqmp_a2197_g_revA_defconfig b/configs/xilinx_zynqmp_a2197_g_revA_defconfig index 2f6dc7641a80..47a98c6d4d8b 100644 --- a/configs/xilinx_zynqmp_a2197_g_revA_defconfig +++ b/configs/xilinx_zynqmp_a2197_g_revA_defconfig @@ -21,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_a2197_m_revA_defconfig b/configs/xilinx_zynqmp_a2197_m_revA_defconfig index d9107d6bb867..fb4020b2dfed 100644 --- a/configs/xilinx_zynqmp_a2197_m_revA_defconfig +++ b/configs/xilinx_zynqmp_a2197_m_revA_defconfig @@ -21,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_a2197_p_revA_defconfig b/configs/xilinx_zynqmp_a2197_p_revA_defconfig index 4ce634cdaacf..d19c6b34cac6 100644 --- a/configs/xilinx_zynqmp_a2197_p_revA_defconfig +++ b/configs/xilinx_zynqmp_a2197_p_revA_defconfig @@ -22,7 +22,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_a2197_revA_defconfig b/configs/xilinx_zynqmp_a2197_revA_defconfig index ace011423249..3498483f4b78 100644 --- a/configs/xilinx_zynqmp_a2197_revA_defconfig +++ b/configs/xilinx_zynqmp_a2197_revA_defconfig @@ -21,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index 93fa7d8f6bdc..4b7fe5dd40e8 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -13,7 +13,6 @@ CONFIG_ZYNQMP_PSU_INIT_ENABLED=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index b4162abdd715..282e93f03ca1 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -14,7 +14,6 @@ CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set -CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 76d5aa6c713b..be709886987b 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -14,7 +14,6 @@ CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set -CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 2b896f79a72e..35776ab20816 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -14,7 +14,6 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index a20534a488ca..383f868625bf 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -17,7 +17,6 @@ CONFIG_ZYNQMP_NO_DDR=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_zynqmp_zc1232_revA_defconfig b/configs/xilinx_zynqmp_zc1232_revA_defconfig index 80a310fb1cee..255217df4bd8 100644 --- a/configs/xilinx_zynqmp_zc1232_revA_defconfig +++ b/configs/xilinx_zynqmp_zc1232_revA_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx_zynqmp_zc1254_revA_defconfig b/configs/xilinx_zynqmp_zc1254_revA_defconfig index 75ec572827bf..e058195842f5 100644 --- a/configs/xilinx_zynqmp_zc1254_revA_defconfig +++ b/configs/xilinx_zynqmp_zc1254_revA_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index ce1ea089ce8d..bbf387a6b072 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index 01c29c0e70a3..d5434eee85a2 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig index 877f5b230da3..4ff52292fb68 100644 --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig index 6f14234a590e..a5a7fc2aeb0b 100644 --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig @@ -16,7 +16,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_CLK=y diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig index f1970aadf417..5b8cf77085d9 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -16,7 +16,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_CLK=y diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig b/configs/xilinx_zynqmp_zcu100_revC_defconfig index cd7d2f5376d2..fc917f0b5d2d 100644 --- a/configs/xilinx_zynqmp_zcu100_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_BIND=y diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig index 52ee2f2a0b04..b64956d5f6a3 100644 --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig @@ -20,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index 2b7cab8add62..8b1a1ce0a2cf 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -20,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index ce271b5a31ca..2aab26dd3fb0 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -20,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y diff --git a/configs/xilinx_zynqmp_zcu104_revA_defconfig b/configs/xilinx_zynqmp_zcu104_revA_defconfig index eacf75d9f8e2..07e58b192ab0 100644 --- a/configs/xilinx_zynqmp_zcu104_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig b/configs/xilinx_zynqmp_zcu104_revC_defconfig index 2f269009dfe9..4829df62b410 100644 --- a/configs/xilinx_zynqmp_zcu104_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig @@ -20,7 +20,6 @@ CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y diff --git a/configs/xilinx_zynqmp_zcu106_revA_defconfig b/configs/xilinx_zynqmp_zcu106_revA_defconfig index 1b685ca04925..72b3ce16a884 100644 --- a/configs/xilinx_zynqmp_zcu106_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig @@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y diff --git a/configs/xilinx_zynqmp_zcu111_revA_defconfig b/configs/xilinx_zynqmp_zcu111_revA_defconfig index 74106d7ea8fa..de739ed3b5f1 100644 --- a/configs/xilinx_zynqmp_zcu111_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y diff --git a/configs/xilinx_zynqmp_zcu1275_revA_defconfig b/configs/xilinx_zynqmp_zcu1275_revA_defconfig index b9110ca3b936..d86c5d1a76a6 100644 --- a/configs/xilinx_zynqmp_zcu1275_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu1275_revA_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx_zynqmp_zcu1275_revB_defconfig b/configs/xilinx_zynqmp_zcu1275_revB_defconfig index 03372c77e637..957b883abde2 100644 --- a/configs/xilinx_zynqmp_zcu1275_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu1275_revB_defconfig @@ -17,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y -CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y # CONFIG_CMD_FLASH is not set
All boards are using the same prompt that's why add it as default value to Kconfig to simplify defconfigs. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- cmd/Kconfig | 1 + configs/avnet_ultra96_rev1_defconfig | 1 - configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - configs/xilinx_zynqmp_a2197_g_revA_defconfig | 1 - configs/xilinx_zynqmp_a2197_m_revA_defconfig | 1 - configs/xilinx_zynqmp_a2197_p_revA_defconfig | 1 - configs/xilinx_zynqmp_a2197_revA_defconfig | 1 - configs/xilinx_zynqmp_mini_defconfig | 1 - configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - configs/xilinx_zynqmp_mini_nand_defconfig | 1 - configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 - configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 - configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - configs/xilinx_zynqmp_zcu106_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu111_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu1275_revA_defconfig | 1 - configs/xilinx_zynqmp_zcu1275_revB_defconfig | 1 - 29 files changed, 1 insertion(+), 28 deletions(-)