Merge tag 'KARO-TX6-2015-03-24' into uboot-merge

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

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index b3e85ed045d1a60fc4d9530077eb492a03a6e5ba..ac7f3d94e3a09d087aaa331e707a1142e57e0c5f 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -25,6 +25,7 @@
 #define CONFIG_SYS_SPL_FIXED_BATT_SUPPLY
 #define TX28_MOD_SUFFIX                        "0"
 #endif
+#define IRAM_BASE_ADDR                 0x00000000
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SKIP_LOWLEVEL_INIT
@@ -52,7 +53,7 @@
 /*
  * Memory configuration options
  */
-#define CONFIG_NR_DRAM_BANKS           1               /* 1 bank of SDRAM */
+#define CONFIG_NR_DRAM_BANKS           0x1             /* 1 bank of SDRAM */
 #define PHYS_SDRAM_1                   0x40000000      /* SDRAM Bank #1 */
 #define CONFIG_STACKSIZE               SZ_64K
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M
@@ -108,7 +109,7 @@
 #else
 #define CONFIG_LOADADDR                        43000000
 #endif
-#define CONFIG_FDTADDR                 40001000
+#define CONFIG_FDTADDR                 41000000
 #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
@@ -240,8 +241,8 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
-#define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1
+#define CONFIG_SYS_MAX_NAND_DEVICE     0x1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BASE           0x00000000