tx53: restructure boot related env settings

- Introduce a 'boot_mode' variable that selects one of the predefined
  boot scripts.
- Run 'bootm_cmd' from 'bootcmd', so that it won't be executed when
  the kernel load fails.

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 8f957b8fe4b39e931fbab97a92a6d1493fcdc24e..6cf286c5f48209082c6c9722536a16f7dc7ac4a1 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -107,7 +107,7 @@
 #define CONFIG_SYS_AUTOLOAD            "no"
 #define CONFIG_BOOTFILE                        "uImage"
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND             "run bootcmd_nand"
+#define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        78000000
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
@@ -124,19 +124,22 @@
        "bootargs_nand=run default_bootargs;set bootargs ${bootargs}"   \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
-       "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
-       "mmc read ${loadaddr} 100 3000;run bootm_cmd\0"                 \
-       "bootcmd_nand=set autostart no;run bootargs_nand;"              \
-       "nboot linux;run bootm_cmd\0"                                   \
-       "bootcmd_net=set autostart no;run bootargs_nfs;dhcp;"           \
-       "run bootm_cmd\0"                                               \
+       " root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"        \
+       " ip=dhcp\0"                                                    \
+       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       ";mmc read ${loadaddr} 100 3000\0"                              \
+       "bootcmd_nand=set autostart no;run bootargs_nand"               \
+       ";nboot linux\0"                                                \
+       "bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"   \
+       ";dhcp\0"                                                       \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
+       "boot_mode=nand\0"                                              \
        "cpu_clk=800\0"                                                 \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        " ${append_bootargs}\0"                                         \
        "fdtaddr=71000000\0"                                            \
-       "fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \
+       "fdtsave=nand erase.part dtb"                                   \
+       ";nand write ${fdtaddr} dtb ${fdtsize}\0"                       \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \