ARM: zynq: fix environment command syntax
authorMelin Tomas <tomas.melin@vaisala.com>
Wed, 10 Apr 2019 07:26:07 +0000 (07:26 +0000)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 16 Apr 2019 09:51:34 +0000 (11:51 +0200)
Update EXTRA_ENV_SETTINGS and related commands to use 'setenv'
instead of short name 'set' in commands.

E.g. in case command setexpr is enabled the short form does not work
properly as the name becomes ambigous.

Fixes error messages like:

    U-Boot> set
    Unknown command 'set' - try 'help'

Signed-off-by: Tomas Melin <tomas.melin@vaisala.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
include/configs/zynq-common.h

index 94177c6..3ab783e 100644 (file)
@@ -69,7 +69,7 @@
 # define CONFIG_THOR_RESET_OFF
 # define DFU_ALT_INFO_RAM \
        "dfu_ram_info=" \
-       "set dfu_alt_info " \
+       "setenv dfu_alt_info " \
        "${kernel_image} ram 0x3000000 0x500000\\\\;" \
        "${devicetree_image} ram 0x2A00000 0x20000\\\\;" \
        "${ramdisk_image} ram 0x2000000 0x600000\0" \
@@ -79,7 +79,7 @@
 # if defined(CONFIG_MMC_SDHCI_ZYNQ)
 #  define DFU_ALT_INFO_MMC \
        "dfu_mmc_info=" \
-       "set dfu_alt_info " \
+       "setenv dfu_alt_info " \
        "${kernel_image} fat 0 1\\\\;" \
        "${devicetree_image} fat 0 1\\\\;" \
        "${ramdisk_image} fat 0 1\0" \
                                "env run importbootenv; " \
                        "fi; " \
                "fi; \0" \
-       "sd_loadbootenv=set bootenv_dev mmc && " \
+       "sd_loadbootenv=setenv bootenv_dev mmc && " \
                        "run setbootenv \0" \
-       "usb_loadbootenv=set bootenv_dev usb && usb start && run setbootenv \0" \
+       "usb_loadbootenv=setenv bootenv_dev usb && usb start && run setbootenv \0" \
        "preboot=if test $modeboot = sdboot; then " \
                        "run sd_loadbootenv; " \
                        "echo Checking if uenvcmd is set ...; " \