Merge branch 'tx53-bugfix' into uboot-merge

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

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index a360acc7c300d708deeb712eea3943ec95f3d85b..ce72d7420ccf1fd8d30b1415bbe1575e010b8a80 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -41,7 +41,7 @@
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_IPUV3_CLK               200000000
+#define CONFIG_IPUV3_CLK               133000000
 #define CONFIG_LCD_LOGO
 #define LCD_BPP                                LCD_COLOR24
 #define CONFIG_CMD_BMP
@@ -51,9 +51,6 @@
 /*
  * Memory configuration options
  */
-#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
@@ -65,7 +62,7 @@
 #define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1    /* Memtest start address */
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1 + SZ_4M)  /* 4 MB RAM test */
 #define CONFIG_SYS_SDRAM_CLK           166
-#define CONFIG_SYS_CLKTL_CBCDR         0x01e35180
+#define CONFIG_SYS_CLKTL_CBCDR         0x01e35100
 
 /*
  * U-Boot general configurations
@@ -91,7 +88,6 @@
 */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 
 /*
  * Boot Linux
@@ -110,7 +106,9 @@
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        94000000
+#define CONFIG_FDTADDR                 90001000
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
+#define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
 #define CONFIG_HW_WATCHDOG
 
@@ -144,8 +142,8 @@
        "cpu_clk=" CONFIG_SYS_CPU_CLK_STR "\0"                          \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        " ${append_bootargs}\0"                                         \
-       "fdtaddr=91000000\0"                                            \
-       "fdtsave=nand erase.part dtb"                                   \
+       "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
+       "fdtsave=fdt resize;nand erase.part dtb"                        \
        ";nand write ${fdtaddr} dtb ${fdtsize}\0"                       \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \