]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - include/configs/tx6.h
karo: tx51,tx53,tx6: remove obsolete CONFIG_SYS_FSL_ESDHC_NUM definition
[karo-tx-uboot.git] / include / configs / tx6.h
index 91159dc4c40990e03e9df2bf6dc0fbdbb5593696..361a81dfda8af95169d298ff5efe49c07943f5f4 100644 (file)
@@ -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
 #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
 #endif /* CONFIG_LCD */
 #endif /* CONFIG_MFG */
 
+#ifdef CONFIG_SYS_LVDS_IF
+#define is_lvds()                      1
+#else
+#define is_lvds()                      0
+#endif
+
 /*
  * Memory configuration options
  */
 #define CONFIG_NR_DRAM_BANKS           1               /* # of SDRAM banks */
 #define PHYS_SDRAM_1                   0x10000000      /* Base address of bank 1 */
-#ifdef CONFIG_MX6Q
-#define PHYS_SDRAM_1_SIZE              SZ_1G
+#ifdef CONFIG_SYS_SDRAM_BUS_WIDTH
+#define PHYS_SDRAM_1_WIDTH             CONFIG_SYS_SDRAM_BUS_WIDTH
+#else
 #define PHYS_SDRAM_1_WIDTH             64
+#endif
+#define PHYS_SDRAM_1_SIZE              (SZ_512M * (PHYS_SDRAM_1_WIDTH / 32))
+
+#ifdef CONFIG_MX6Q
 #define CONFIG_SYS_SDRAM_CLK           528
 #else
-#define PHYS_SDRAM_1_SIZE              SZ_512M
-#define PHYS_SDRAM_1_WIDTH             32
 #define CONFIG_SYS_SDRAM_CLK           400
 #endif
 #define CONFIG_STACKSIZE               SZ_128K
 #else
 #define CONFIG_SYS_PROMPT              "TX6DL U-Boot > "
 #endif
-#define CONFIG_SYS_CBSIZE              2048            /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                               sizeof(CONFIG_SYS_PROMPT) + 16) /* Print buffer size */
-#define CONFIG_SYS_MAXARGS             64              /* Max number of command args */
+#define CONFIG_SYS_CBSIZE              2048    /* Console I/O buffer size */
+#define CONFIG_SYS_PBSIZE                                              \
+       (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+                                               /* Print buffer size */
+#define CONFIG_SYS_MAXARGS             64      /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-                                       /* Boot argument buffer size */
-#define CONFIG_VERSION_VARIABLE                /* U-BOOT version */
-#define CONFIG_AUTO_COMPLETE           /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING         /* Command history etc */
+                                               /* Boot argument buffer size */
+#define CONFIG_VERSION_VARIABLE                        /* U-BOOT version */
+#define CONFIG_AUTO_COMPLETE                   /* Command auto complete */
+#define CONFIG_CMDLINE_EDITING                 /* Command history etc */
 
 #define CONFIG_SYS_64BIT_VSPRINTF
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_OF_LIBFDT
 #ifdef CONFIG_OF_LIBFDT
 #define CONFIG_FDT_FIXUP_PARTITIONS
-#define CONFIG_OF_EMBED
 #define CONFIG_OF_BOARD_SETUP
-#ifdef CONFIG_MX6Q
-#define CONFIG_DEFAULT_DEVICE_TREE     tx6q
-#define CONFIG_ARCH_DEVICE_TREE                mx6q
-#else
-#define CONFIG_DEFAULT_DEVICE_TREE     tx6dl
-#define CONFIG_ARCH_DEVICE_TREE                mx6dl
-#endif
 #define CONFIG_SYS_FDT_ADDR            (PHYS_SDRAM_1 + SZ_16M)
 #endif /* CONFIG_OF_LIBFDT */
 #endif /* CONFIG_MFG */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_SERIAL_TAG
 #ifndef CONFIG_MFG
 #define CONFIG_BOOTDELAY               1
 #else
 #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
 
        "cpu_clk=800\0"                                                 \
        "bootdelay=-1\0"                                                \
        "default_bootargs=set bootargs " CONFIG_BOOTARGS                \
-       " video=${video_mode} ${append_bootargs}\0"                     \
+       " ${append_bootargs}\0"                                         \
        "fdtaddr=11000000\0"                                            \
+       "fdtsave=nand erase.part dtb;nand write ${fdtaddr} dtb ${fdtsize}\0" \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "otg_mode=device\0"                                             \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=VGA-1:640x480MR-24@60\0"
+       "video_mode=VGA\0"
 #endif /*  CONFIG_ENV_IS_NOWHERE */
 #endif /*  CONFIG_MFG */
 
 #define CONFIG_CMD_BOOTCE
 #define CONFIG_CMD_TIME
 #define CONFIG_CMD_I2C
+#define CONFIG_CMD_MEMTEST
 
 /*
  * Serial Driver
 #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
  * I2C Configs
  */
 #ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C                        1
-#define CONFIG_I2C_MXC                 1
+#define CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_MX6_PORT1
-#define CONFIG_SYS_I2C_SPEED           10000
+#define CONFIG_SYS_I2C_SPEED           400000
 #define CONFIG_SYS_I2C_SLAVE           0x3c
-#define CONFIG_MX6_INTER_LDO_BYPASS    0
 #endif
 
 #ifndef CONFIG_ENV_IS_NOWHERE
 #define CONFIG_MTD_DEBUG
 #define CONFIG_MTD_DEBUG_VERBOSE       4
 #endif
-#ifndef CONFIG_SYS_NAND_ERASE_SIZE
-#define CONFIG_SYS_NAND_ERASE_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_ERASE_SIZE
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
 #define CONFIG_ENV_SIZE                        SZ_128K
-#define CONFIG_ENV_RANGE               (3 * CONFIG_SYS_NAND_ERASE_SIZE)
+#define CONFIG_ENV_RANGE               (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 #define CONFIG_SYS_ENV_PART_STR                xstr(CONFIG_SYS_ENV_PART_SIZE)  \
        "(env),"                                                        \
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       2
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
 
 #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 ","         \
 #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 */