summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2019-04-09 13:53:35 +0200
committerIgor Opaniuk <igor.opaniuk@toradex.com>2019-04-12 11:12:08 +0200
commit9304631dc7b4e14bb0f866369778432b190af140 (patch)
tree4c18b0320ee47e85b08959832b4435b44e03a5f8
parent96830baab62668d4ee7706d74c066d93c8d933d5 (diff)
colibri_t20: configs: invoke dhcp before tftp usage
Receive DHCP configuration before running tftp command for fetching proper dtb. When `run nfsboot` is invoked before DHCP configuration is received, the booting process is stuck on: Colibri iMX6 # run nfsboot Booting via DHCP/TFTP/NFS... Using FEC device TFTP from server 192.168.10.1; our IP address is 192.168.10.2 Filename '---.dtb'. Load address: 0x12100000 Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
-rw-r--r--include/configs/colibri_t20.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index b056c8f4b5..962ba8ccfa 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -109,11 +109,11 @@
"nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
"nfsboot=usb start; run setup; setenv bootargs ${defargs} ${mtdparts}" \
" ${nfsargs} ${setupargs} ${vidargs}; echo Booting via DHCP/" \
- "TFTP/NFS...; run nfsdtbload; dhcp ${kernel_addr_r} " \
- "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
+ "TFTP/NFS...; dhcp ${kernel_addr_r} && run nfsdtbload && " \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \
"${soc}-colibri-${fdt_board}.dtb " \
- "&& setenv dtbparam ${fdt_addr_r}\0"
+ "&& setenv dtbparam ${fdt_addr_r}; true\0"
#define SD_BOOTCMD \
"sdargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext3 rootwait\0" \