summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2019-03-27 13:29:29 +0200
committerIgor Opaniuk <igor.opaniuk@toradex.com>2019-04-12 11:12:07 +0200
commitf4a62618759acf3e7bbfbce71fd9fdd974a653a7 (patch)
treec35d3e9a8b016f1e2fd44c0ae71e3704ab5ac27e
parentb19b8777beef33d6523cc716803c81981a43fe10 (diff)
apalis-imx6: 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_imx6.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index fa40c629c3..4b2e519ab9 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -231,10 +231,10 @@
"nfsboot=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} ${fdt_file} " \
- "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+ "&& setenv dtbparam \" - ${fdt_addr_r}\"; true\0"
#define SD_BOOTCMD \
"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \