karo: reset fdtaddr to the original value due to prevent overlap with linux kernel

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

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 06072aaf49ce31a1e67e3b3071df356ad3984255..fad1b28d3af4bb41b658eb0dcfdc02fc10d24315 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -40,23 +40,18 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
 
-#ifdef CONFIG_SYS_LVDS_IF
-#define is_lvds()                      1
-#else
-#define is_lvds()                      0
-#endif
-
 /*
  * Memory configuration options
  */
+#ifndef CONFIG_SYS_SDRAM_SIZE
+#define CONFIG_SYS_SDRAM_SIZE          (SZ_512M * CONFIG_NR_DRAM_BANKS)
+#endif
+
 #define PHYS_SDRAM_1                   0x70000000      /* Base address of bank 1 */
-#define PHYS_SDRAM_1_SIZE              SZ_512M
+#define PHYS_SDRAM_1_SIZE              (CONFIG_SYS_SDRAM_SIZE / CONFIG_NR_DRAM_BANKS)
 #if CONFIG_NR_DRAM_BANKS > 1
 #define PHYS_SDRAM_2                   0xb0000000      /* Base address of bank 2 */
-#define PHYS_SDRAM_2_SIZE              SZ_512M
-#define TX53_MOD_SUFFIX                        "1"
-#else
-#define TX53_MOD_SUFFIX                        "0"
+#define PHYS_SDRAM_2_SIZE              PHYS_SDRAM_1_SIZE
 #endif
 #define CONFIG_STACKSIZE               SZ_128K
 #define CONFIG_SYS_MALLOC_LEN          SZ_8M
@@ -73,7 +68,7 @@
 #define CONFIG_SYS_PBSIZE \
        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
                                                /* Print buffer size */
-#define CONFIG_SYS_MAXARGS             64      /* Max number of command args */
+#define CONFIG_SYS_MAXARGS             256     /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
                                                /* Boot argument buffer size */
 #define CONFIG_VERSION_VARIABLE                        /* U-BOOT version */
@@ -88,7 +83,6 @@
 */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 
 /*
  * Boot Linux
@@ -107,9 +101,16 @@
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
 #define CONFIG_LOADADDR                        78000000
+#define CONFIG_FDTADDR                 71000000
 #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
+#ifndef CONFIG_SYS_LVDS_IF
+#define DEFAULT_VIDEO_MODE             "VGA"
+#else
+#define DEFAULT_VIDEO_MODE             "HSD100PXN1"
+#endif
 
 /*
  * Extra Environment Settings
@@ -139,15 +140,15 @@
        "cpu_clk=800\0"                                                 \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
        " ${append_bootargs}\0"                                         \
-       "fdtaddr=71000000\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"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=VGA\0"
+       "video_mode=" DEFAULT_VIDEO_MODE "\0"
 
 #define MTD_NAME                       "mxc_nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
@@ -252,6 +253,7 @@
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
+#define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
 
 /*
@@ -273,12 +275,12 @@
        xstr(CONFIG_ENV_RANGE)                                          \
        "(env),"                                                        \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),108032k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env2),6m(linux),32m(rootfs),89344k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #else
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m(u-boot),"                                                   \
        xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),108416k(userfs),256k(dtb),512k@0x7f80000(bbt)ro"
+       "(env),6m(linux),32m(rootfs),89728k(userfs),512k@0x7f00000(dtb),512k@0x7f80000(bbt)ro"
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1