Merge branch 'fdt-cleanup' into uboot-rel

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

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index 5005a47ebc949f193b72134b2f67ed7d46e81f19..6506f142aa5f770825316c524f5dc959aa2eef54 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -51,6 +51,9 @@
 /*
  * Memory configurations
  */
+#ifndef CONFIG_SYS_SDRAM_CLK
+#define CONFIG_SYS_SDRAM_CLK           166
+#endif
 #define PHYS_SDRAM_1                   0x90000000      /* Base address of bank 1 */
 #define PHYS_SDRAM_1_SIZE              SZ_128M
 #if CONFIG_NR_DRAM_BANKS > 1
@@ -98,7 +101,6 @@
  * Flattened Device Tree (FDT) support
 */
 #define CONFIG_OF_LIBFDT
-#define CONFIG_OF_EMBED
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_DEFAULT_DEVICE_TREE     tx51
 #define CONFIG_ARCH_DEVICE_TREE                mx51
@@ -146,14 +148,15 @@
        "run bootm_cmd\0"                                               \
        "bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"                    \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
-       " video=${video_mode} ${append_bootargs}\0"                     \
+       " ${append_bootargs}\0"                                         \
        "cpu_clk=" xstr(CONFIG_SYS_CPU_CLK) "\0"                        \
        "fdtaddr=91000000\0"                                            \
+       "fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=VGA-1:640x480MR-24@60\0"
+       "video_mode=VGA\0"
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
@@ -271,12 +274,12 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),256k(dtb),-(userfs)"
+       "(env2),4m(linux),16m(rootfs),256k(dtb),?(userfs),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),256k(dtb),-(userfs)"
+       "(env),4m(linux),16m(rootfs),256k(dtb),?(userfs),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1