summaryrefslogtreecommitdiff
path: root/include/configs/colibri_t20.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs/colibri_t20.h')
-rw-r--r--include/configs/colibri_t20.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 6f53454baf..b056c8f4b5 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -116,15 +116,14 @@
"&& setenv dtbparam ${fdt_addr_r}\0"
#define SD_BOOTCMD \
- "sdargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext3 " \
- "rootwait\0" \
+ "sdargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext3 rootwait\0" \
"sdboot=run setup; setenv bootargs ${defargs} ${mtdparts} ${sdargs} " \
- "${setupargs} ${vidargs}; echo Booting from SD card...; " \
+ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
"run sddtbload; load mmc 0:1 ${kernel_addr_r} ${boot_file} " \
"&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
"sddtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
- "${soc}-colibri-${fdt_board}.dtb " \
- "&& setenv dtbparam ${fdt_addr_r}\0"
+ "${soc}-colibri-${fdt_board}.dtb && setenv dtbparam " \
+ "${fdt_addr_r}\0"
#define UBI_BOOTCMD \
"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \