upgrade to upstream version 2013.07

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

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index e0fde5cd18a3319aa1861ecbe57a0ebbe8bbc6e4..5005a47ebc949f193b72134b2f67ed7d46e81f19 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier:      GPL-2.0
  *
  */
-#ifndef __CONFIGS_TX51_H
-#define __CONFIGS_TX51_H
 
-#define CONFIG_MX51                            /* must be set before including imx-regs.h */
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_MX51                    /* must be set before including imx-regs.h */
 
 #include <asm/sizes.h>
 #include <asm/arch/imx-regs.h>
@@ -16,7 +17,7 @@
  * Ka-Ro TX51 board - SoC configuration
  */
 #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 */
@@ -163,9 +164,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
@@ -211,8 +209,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 // 0xcfff0000
-#define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR // 0x83fdb000
+#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
@@ -289,4 +287,4 @@
 #define CONFIG_FSL_IIM
 #endif
 
-#endif /* __CONFIGS_TX51_H */
+#endif /* __CONFIG_H */