aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Didin <Evgeniy.Didin@synopsys.com>2018-07-09 12:31:30 +0300
committerJohn Crispin <john@phrozen.org>2018-07-12 10:24:31 +0200
commit12915b105a0f9bd773f9b710972e5184f5413d91 (patch)
tree089b312d3545a1b90ecca0941da60d800cddc764
parentd238c7f99599e697b67f27e5d561d21d2f2eeae7 (diff)
downloadupstream-12915b105a0f9bd773f9b710972e5184f5413d91.tar.gz
upstream-12915b105a0f9bd773f9b710972e5184f5413d91.tar.bz2
upstream-12915b105a0f9bd773f9b710972e5184f5413d91.zip
arc: Update variables substitutions in u-boot env files
In the latest version of u-boot (2018.05) there was a swith to Hush shell for ARC AXS10x boards(arc770/archs38): commit 9249d74781e1 ("ARC: AXS10x: Enable hush shell"). In Hush shell using "$()" to declare envitonment variables is forbidden, instead of this "${}" need to be used. Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> Cc: Alexey Brodkin <abrodkin@synopsys.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Cc: John Crispin <john@phrozen.org>
-rw-r--r--target/linux/arc770/image/uEnv.txt6
-rw-r--r--target/linux/archs38/image/uEnv.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/arc770/image/uEnv.txt b/target/linux/arc770/image/uEnv.txt
index 35549cb1c4..53632e8bb6 100644
--- a/target/linux/arc770/image/uEnv.txt
+++ b/target/linux/arc770/image/uEnv.txt
@@ -1,7 +1,7 @@
setenv kernel_addr_r 0x82000000
setenv fdt_addr_r 0x83000000
-setenv loadkernel fatload mmc 0 \$(kernel_addr_r) uImage
-setenv loaddtb fatload mmc 0 \$(fdt_addr_r) \$(dts)
+setenv loadkernel fatload mmc 0 \${kernel_addr_r} uImage
+setenv loaddtb fatload mmc 0 \${fdt_addr_r} \${dts}
setenv bootargs earlycon=uart8250,mmio32,0xe0022000,115200n8 console=ttyS3,115200n8 root=/dev/mmcblk0p2 rootwait print-fatal-signals=1
-setenv uenvcmd run loadkernel\; run loaddtb\; bootm \$(kernel_addr_r) - \$(fdt_addr_r)
+setenv uenvcmd run loadkernel\; run loaddtb\; bootm \${kernel_addr_r} - \${fdt_addr_r}
run uenvcmd
diff --git a/target/linux/archs38/image/uEnv.txt b/target/linux/archs38/image/uEnv.txt
index 35549cb1c4..53632e8bb6 100644
--- a/target/linux/archs38/image/uEnv.txt
+++ b/target/linux/archs38/image/uEnv.txt
@@ -1,7 +1,7 @@
setenv kernel_addr_r 0x82000000
setenv fdt_addr_r 0x83000000
-setenv loadkernel fatload mmc 0 \$(kernel_addr_r) uImage
-setenv loaddtb fatload mmc 0 \$(fdt_addr_r) \$(dts)
+setenv loadkernel fatload mmc 0 \${kernel_addr_r} uImage
+setenv loaddtb fatload mmc 0 \${fdt_addr_r} \${dts}
setenv bootargs earlycon=uart8250,mmio32,0xe0022000,115200n8 console=ttyS3,115200n8 root=/dev/mmcblk0p2 rootwait print-fatal-signals=1
-setenv uenvcmd run loadkernel\; run loaddtb\; bootm \$(kernel_addr_r) - \$(fdt_addr_r)
+setenv uenvcmd run loadkernel\; run loaddtb\; bootm \${kernel_addr_r} - \${fdt_addr_r}
run uenvcmd