Skip to contentSkip to conversation

arm: zynq: fix environment command syntax

PATCH New Melin Tomas 2 participants 2 messages Apr 10, 2019 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: zynq: fix environment command syntax

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'

---
 include/configs/zynq-common.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/configs/zynq-common.h +4 -4
index 864f3220f3..6e7431d220 100644
@@ -70,7 +70,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" \
@@ -80,7 +80,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" \
@@ -187,9 +187,9 @@
 				"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 ...; " \
Signature · 1 line
2.17.2
Applied
#1 lore raw

PATCH 1/1 arm: zynq: fix environment command syntax

Quoted 41 lines · Melin Tomas

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'

---
 include/configs/zynq-common.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/configs/zynq-common.h +2 -2
index 864f3220f3..6e7431d220 100644
@@ -70,7 +70,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" \
@@ -80,7 +80,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" \
@@ -187,9 +187,9 @@
 				"env run importbootenv; " \

include/configs/zynq-common.h line 195

Quoted 10 lines
include/configs/zynq-common.h +2 -2
 			"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 ...; " \

applied.
M