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

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

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index ce72d7420ccf1fd8d30b1415bbe1575e010b8a80..19bb7c49865b84d9ffe19697e451c8aaa37824b0 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -106,7 +106,7 @@
 #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_FDTADDR                 91000000
 #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
@@ -210,8 +210,8 @@
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS
-#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
 #ifdef CONFIG_ENV_IS_IN_NAND