diff mbox series

[U-Boot,3/4] ARM: bootscript: Fix the nfsargs and addip in K+P's tpcboot.cmd

Message ID 20180831115828.15831-3-lukma@denx.de
State Accepted
Commit 7e6bba20f5d80b07574d317c4b62d89bd36c400f
Delegated to: Stefano Babic
Headers show
Series None | expand

Commit Message

Lukasz Majewski Aug. 31, 2018, 11:58 a.m. UTC 
The quotes around ${bootargs} were missing as we elaborate those variables
twice - once when we "setenv" the command and secondly when we "run" it.
Without quotes we have just empty string in the second call.

Moreover there is an issue with line breaks - as the original commands
got truncated.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

---

 board/k+p/bootscripts/tpcboot.cmd | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/board/k+p/bootscripts/tpcboot.cmd b/board/k+p/bootscripts/tpcboot.cmd
index ebd2d4ec2a..e26fd72825 100644
--- a/board/k+p/bootscripts/tpcboot.cmd
+++ b/board/k+p/bootscripts/tpcboot.cmd
@@ -65,17 +65,14 @@  fi"
 #
 # Provide 'boot_nfs' command
 #------------------------------------------------------------
-setenv nfsargs "setenv bootargs root=/dev/nfs rw \
-       nfsroot=${serverip}:${rootpath},nolock,nfsvers=3"
-setenv addip "setenv bootargs ${bootargs} \
-       ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:\
-       ${hostname}:eth0:on"
+setenv nfsargs "setenv bootargs root=/dev/nfs rw nfsroot='${serverip}':'${rootpath}',nolock,nfsvers=3"
+setenv addip "setenv bootargs '${bootargs}' ip='${ipaddr}':'${serverip}':'${gatewayip}':'${netmask}':'${hostname}':eth0:on"
 
 setenv boot_nfs "
 if run download_kernel; then
 	run nfsargs;
 	run addip;
-	setenv bootargs ${bootargs} console=${console};
+	setenv bootargs '${bootargs}' console=${console};
 
 	run boot_fitImage;
 fi"