summaryrefslogtreecommitdiff
path: root/include/configs/apalis_imx6.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs/apalis_imx6.h')
-rw-r--r--include/configs/apalis_imx6.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 125241cdf4..e413ae347a 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -236,14 +236,11 @@
"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define SD_BOOTCMD \
- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \
- "rootwait\0" \
- "sdboot=run setup; " \
- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
- "${vidargs}; echo Booting from SD card; " \
- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
- "${boot_file} && run fdt_fixup && " \
- "bootz ${kernel_addr_r} ${dtbparam}\0" \
+ "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
+ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+ "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
+ "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
+ "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"