dfu-boot: tftp: Fix boot failures

Quoted string will not do $ expansion in the uboot prompt
Remove them to ensure that the console and optarg variables
are expanded for tftp boot.

Also update the template to describe full path for mounting the
NFS correctly

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>

diff --git a/k3-bootswitch/dfu-boot.sh b/k3-bootswitch/dfu-boot.sh
index 48c32171288aaa86e9d4915c067e97449f3158b0..9f50ebdb6aea5f8c6c3352f32a1642b9c87facad 100755 (executable)
--- a/k3-bootswitch/dfu-boot.sh
+++ b/k3-bootswitch/dfu-boot.sh
@@ -142,7 +142,7 @@ nfspath=$2
 
        cat >>$uart_dev << EOF
 run findfdt
-setenv bootargs 'console=\$console \$optargs root=/dev/nfs rw  nfsroot=$ipaddr:$nfspath,nolock,v3,tcp,rsize=4096,wsize=4096 ip=dhcp sysrq_always_enabled loglevel=8 earlycon=ns16550a,mmio32,0x02800000 '
+setenv bootargs console=\$console \$optargs root=/dev/nfs rw  nfsroot=$ipaddr:$nfspath,nolock,v3,tcp,rsize=4096,wsize=4096 ip=dhcp sysrq_always_enabled loglevel=8 earlycon=ns16550a,mmio32,0x02800000
 setenv bootcmd 'run args_all; setenv autoload no; dhcp; setenv serverip $ipaddr; run findfdt; tftp \${loadaddr} Image; tftp \${fdtaddr} \${name_fdt}; fdt address \${fdtaddr}; fdt resize 0x100000; booti \${loadaddr} - \${fdtaddr}'
 boot
 EOF

diff --git a/k3-bootswitch/k3bootswitch.conf b/k3-bootswitch/k3bootswitch.conf
index 584ba20928728794a33b9caf8d93b591a2ca262e..c653d8fd5a449053ca0e2975e10a9a98a1cf410d 100644 (file)
--- a/k3-bootswitch/k3bootswitch.conf
+++ b/k3-bootswitch/k3bootswitch.conf
@@ -1,17 +1,17 @@
 [core]
-ipaddr = 10.24.xx.xxx
+       ipaddr = 10.24.xx.xxx
 
 [j721e-evm]
        switch = 0
        uart_dev = /dev/ttyUSB0
-       nfspath = ~/targetfs/coresdk70
+       nfspath = /home/xxxx/targetfs/coresdk70
 
 [j7200-evm]
        switch = 1
        uart_dev = /dev/ttyUSB6
-       nfspath = ~/targetfs/coresdk70
+       nfspath = /home/xxxx/targetfs/coresdk70
 
 [am65xx-evm]
        switch = 2
        uart_dev = /dev/ttyUSB12
-       nfspath = ~/targetfs/coresdk70
+       nfspath = /home/xxxx/targetfs/coresdk70