karo: tx6: restructure boot related env settings

[karo-tx-uboot.git] / include / configs / tx6.h

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 554c0c9df6ea35092159942fc8ee594803519cd3..64c86c6f7fa799c1ff274e992e35534de9f9e1ad 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -39,6 +39,12 @@
 #endif /* CONFIG_LCD */
 #endif /* CONFIG_MFG */
 
+#ifdef CONFIG_SYS_LVDS_IF
+#define is_lvds()                      1
+#else
+#define is_lvds()                      0
+#endif
+
 /*
  * Memory configuration options
  */
@@ -123,8 +129,8 @@
 #define CONFIG_SYS_AUTOLOAD            "no"
 #ifndef CONFIG_MFG
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_BOOTARGS                        "console=ttymxc0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND             "run bootcmd_nand"
+#define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
+#define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #else
 #define CONFIG_BOOTCOMMAND             "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
 #define CONFIG_BOOTCMD_MFG_LOADADDR    10500000
@@ -151,24 +157,31 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
        "baseboard=stk5-v3\0"                                           \
-       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/mmcblk0p3 rootwait\0"                               \
-       "bootargs_nand=run default_bootargs;set bootargs ${bootargs}"   \
+       "bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"  \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
+       "bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"    \
+       " root=/dev/mmcblk0p2 rootwait\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;"                \
-       "fatload mmc 0 ${loadaddr} uImage;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"                                                    \
+       "bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"  \
+       " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"           \
+       "bootcmd_jffs2=set autostart no;run bootargs_jffs2"             \
+       ";nboot linux\0"                                                \
+       "bootcmd_mmc=set autostart no;run bootargs_mmc"                 \
+       ";fatload mmc 0 ${loadaddr} uImage\0"                           \
+       "bootcmd_nand=set autostart no;run bootargs_ubifs"              \
+       ";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"                                                 \
-       "bootdelay=-1\0"                                                \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
-       " video=${video_mode} ${append_bootargs}\0"                     \
+       " ${append_bootargs}\0"                                         \
        "fdtaddr=11000000\0"                                            \
+       "fdtsave=nand erase.part dtb"                                   \
+       ";nand write ${fdtaddr} dtb ${fdtsize}\0"                       \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \
@@ -238,13 +251,12 @@
  * I2C Configs
  */
 #ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C                        1
-#define CONFIG_I2C_MXC                 1
+#define CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_MX6_PORT1
-#define CONFIG_SYS_I2C_SPEED           10000
+#define CONFIG_SYS_I2C_SPEED           400000
 #define CONFIG_SYS_I2C_SLAVE           0x3c
-#define CONFIG_MX6_INTER_LDO_BYPASS    0
 #endif
 
 #ifndef CONFIG_ENV_IS_NOWHERE