From 7e6bba20f5d80b07574d317c4b62d89bd36c400f Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 31 Aug 2018 13:58:27 +0200 Subject: [PATCH] ARM: bootscript: Fix the nfsargs and addip in K+P's tpcboot.cmd 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 --- board/k+p/bootscripts/tpcboot.cmd | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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" -- 2.25.1