upgrade to upstream version 2013.07

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

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index afbead9a6c1d9bb07d88e8d88382db9eaa5568b5..24058cb25965590140a48ff293f6f6c55da460c8 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -1,19 +1,15 @@
 /*
  * Copyright (C) 2012 <LW@KARO-electronics.de>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
+ * SPDX-License-Identifier:      GPL-2.0
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
  */
-#ifndef __TX6_H
-#define __TX6_H
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
 
 #include <asm/sizes.h>
+#include <asm/arch/imx-regs.h>
 
 /*
  * Ka-Ro TX6 board - SoC configuration
@@ -31,12 +27,11 @@
 #ifndef CONFIG_MFG
 /* LCD Logo and Splash screen support */
 #define CONFIG_LCD
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_IPU_CLKRATE             266000000
+#define CONFIG_IPUV3_CLK               266000000
 #define CONFIG_LCD_LOGO
 #define LCD_BPP                                LCD_COLOR24
 #define CONFIG_CMD_BMP
@@ -138,7 +133,6 @@
 #endif /* CONFIG_MFG */
 #define CONFIG_LOADADDR                        18000000
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
-#define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
 #define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS  3000
 
@@ -200,6 +194,7 @@
 #define CONFIG_CMD_BOOTCE
 #define CONFIG_CMD_TIME
 #define CONFIG_CMD_I2C
+#define CONFIG_CMD_MEMTEST
 
 /*
  * Serial Driver
@@ -222,6 +217,7 @@
 #ifdef CONFIG_FEC_MXC
 /* This is required for the FEC driver to work with cache enabled */
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
+#define CONFIG_SYS_CACHELINE_SIZE      64
 
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR         0
@@ -270,15 +266,11 @@
 #define CONFIG_MTD_DEBUG
 #define CONFIG_MTD_DEBUG_VERBOSE       4
 #endif
-#ifndef CONFIG_SYS_NAND_BLOCK_SIZE
-#define CONFIG_SYS_NAND_BLOCK_SIZE     SZ_128K
-#endif
 #define CONFIG_NAND_MXS
 #define CONFIG_NAND_MXS_NO_BBM_SWAP
 #define CONFIG_APBH_DMA
 #define CONFIG_APBH_DMA_BURST
 #define CONFIG_APBH_DMA_BURST8
-#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_MAX_FLASH_BANKS     1
@@ -345,7 +337,7 @@
 
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        xstr(CONFIG_SYS_U_BOOT_PART_SIZE)                               \
-       "@" xstr(CONFIG_SYS_U_BOOT_OFFSET)                              \
+       "@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS)                           \
        "(u-boot),"                                                     \
        CONFIG_SYS_ENV_PART_STR                                         \
        "4m(linux),32m(rootfs)," CONFIG_SYS_USERFS_PART_STR ","         \
@@ -358,8 +350,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
                                        GENERATED_GBL_DATA_SIZE)
 
-#ifdef CONFIG_CMD_IIM
-#define CONFIG_IMX_IIM
-#endif
-
 #endif /* __CONFIG_H */