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 2588e8d63d40fc4aa87f6f5ca718fc3e54bb0d06..fad1b28d3af4bb41b658eb0dcfdc02fc10d24315 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -43,14 +43,15 @@
 /*
  * 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
@@ -100,11 +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                 70001000
+#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
@@ -142,7 +148,7 @@
        "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