Merge branch 'tx28-update-2016-02-03' into karo-tx6

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

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index de5adbdfa74ff8e0c49895c05ae5eb6b62eb8f19..5976ef8558ef25fc34dd975bd383d8f5c28d87f4 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -183,7 +183,8 @@
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 #define CONFIG_SYS_CACHELINE_SIZE      32
 
-#ifdef CONFIG_FEC_MXC_PHYADDR
+#ifdef CONFIG_TX28_S
+#define CONFIG_FEC_MXC_PHYADDR         0
 #define IMX_FEC_BASE                   MXS_ENET0_BASE
 #endif
 
@@ -201,7 +202,9 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     0x1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_BASE           0x00000000
-#endif /* CONFIG_CMD_NAND */
+#endif /* CONFIG_NAND */
+
+#define CONFIG_ENV_OVERWRITE
 
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
@@ -236,7 +239,6 @@
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_ENV_OVERWRITE
 /* Associated with the MMC layout defined in mmcops.c */
 #define CONFIG_ENV_OFFSET              SZ_1K
 #define CONFIG_ENV_SIZE                        (SZ_128K - CONFIG_ENV_OFFSET)