summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2019-03-27 13:24:39 +0200
committerIgor Opaniuk <igor.opaniuk@toradex.com>2019-04-12 11:12:07 +0200
commitb19b8777beef33d6523cc716803c81981a43fe10 (patch)
tree1ecdabdd23a5c1e66bb8b26e89839294b92ccc4f
parenta25307f6843b46ec366ef4382c7c3b60b5e95a2d (diff)
apalis-tk1: 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/apalis-tk1.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 5eaf7c051a..3d7c80d17b 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -106,11 +106,11 @@
"nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
"nfsboot=pci enum; run setup; setenv bootargs ${defargs} ${nfsargs} " \
"${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
- "run nfsdtbload; dhcp ${kernel_addr_r} " \
- "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
+ "dhcp ${kernel_addr_r} && run nfsdtbload && " \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \
"${soc}-${fdt_module}-${fdt_board}.dtb " \
- "&& setenv dtbparam ${fdt_addr_r}\0"
+ "&& setenv dtbparam ${fdt_addr_r}; true\0"
#define SD_BOOTCMD \
"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \