Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 8fcb1b8..07060c6 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -48,6 +48,8 @@ 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
@@ -531,7 +533,6 @@ config CMD_ENV_FLAGS
 config CMD_NVEDIT_EFI
        bool "env [set|print] -e - set/print UEFI variables"
        depends on EFI_LOADER
-       default y
        imply HEXDUMP
        help
          UEFI variables are encoded as some form of U-Boot variables.
@@ -1517,7 +1518,7 @@ config CMD_BMP
        bool "Enable 'bmp' command"
        depends on LCD || DM_VIDEO || VIDEO
        help
-         This provides a way to obtain information about a BMP-format iamge
+         This provides a way to obtain information about a BMP-format image
          and to display it. BMP (which presumably stands for BitMaP) is a
          file format defined by Microsoft which supports images of various
          depths, formats and compression methods. Headers on the file