upgrade to upstream version 2013.07

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

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 8044fd09b2a321ec695b1906aca9881e41c3a75a..3b2eb240f37869c0afa1bcb95166a7e95466ab5b 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -5,10 +5,10 @@
  *
  */
 
-#ifndef __CONFIGS_TX53_H
-#define __CONFIGS_TX53_H
+#ifndef __CONFIG_H
+#define __CONFIG_H
 
-#define CONFIG_MX53                            /* must be set before including imx-regs.h */
+#define CONFIG_MX53                    /* must be set before including imx-regs.h */
 
 #include <asm/sizes.h>
 #include <asm/arch/imx-regs.h>
@@ -16,9 +16,9 @@
 /*
  * Ka-Ro TX53 board - SoC configuration
  */
-#define CONFIG_TX53                            /* TX53 SoM */
+#define CONFIG_TX53                    /* TX53 SoM */
 #define CONFIG_SYS_MX5_IOMUX_V3
-#define CONFIG_MXC_GPIO                                /* GPIO control */
+#define CONFIG_MXC_GPIO                        /* GPIO control */
 #define CONFIG_SYS_MX5_HCLK            24000000
 #define CONFIG_SYS_DDR_CLKSEL          0
 #define CONFIG_SYS_HZ                  1000    /* Ticks per second */
@@ -147,9 +147,6 @@
  */
 #include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
-#if 0
-#define CONFIG_CMD_IIM
-#endif
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_MTDPARTS
@@ -195,8 +192,8 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_NAND_MXC
-#define CONFIG_MXC_NAND_REGS_BASE      NFC_BASE_ADDR_AXI // 0xf7ff0000
-#define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR // 0x63fdb000
+#define CONFIG_MXC_NAND_REGS_BASE      NFC_BASE_ADDR_AXI
+#define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
@@ -231,9 +228,6 @@
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
-#if 0
-#define CONFIG_SYS_FSL_ESDHC_USE_PIO
-#endif
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       2
 
@@ -276,4 +270,4 @@
 #define CONFIG_FSL_IIM
 #endif
 
-#endif /* __CONFIGS_TX53_H */
+#endif /* __CONFIG_H */