summaryrefslogtreecommitdiff
path: root/include/configs/m53evk.h
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-10-14 15:39:27 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-10-14 15:39:27 +0200
commit4181f1b45cdbac89f2f626a50ce59aa9c4fdf8dd (patch)
tree3bb7b8623e3caeaa0153b18bd8c9a5594330d4f9 /include/configs/m53evk.h
parent673ed5cf1f142b0e01959fa1e086ec7fdec4a9ae (diff)
parentc43fd23cf619856b0763a64a6a3bcf3663058c49 (diff)
Merge tag 'v2014.10' into 2014.10-toradex-next
Prepare v2014.10
Diffstat (limited to 'include/configs/m53evk.h')
-rw-r--r--include/configs/m53evk.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index df6a2261099..c133ba9d03f 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -38,6 +38,7 @@
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
@@ -305,7 +306,7 @@
"addargs=run addcons addmtd addmisc\0" \
"mmcload=" \
"mmc rescan ; " \
- "ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0" \
+ "load mmc 0:1 ${kernel_addr_r} ${bootfile}\0" \
"ubiload=" \
"ubi part UBI ; ubifsmount ubi0:rootfs ; " \
"ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \
@@ -348,10 +349,12 @@
"bootm ${kernel_addr_r}\0" \
"try_bootscript=" \
"mmc rescan;" \
- "if ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};" \
- "then;" \
- "\techo Running bootscript...;" \
- "\tsource ${kernel_addr_r};" \
+ "if test -e mmc 0:1 ${bootscript} ; then " \
+ "if load mmc 0:1 ${kernel_addr_r} ${bootscript};" \
+ "then ; " \
+ "echo Running bootscript... ; " \
+ "source ${kernel_addr_r} ; " \
+ "fi ; " \
"fi\0"
#endif /* __M53EVK_CONFIG_H__ */