]> git.karo-electronics.de Git - karo-tx-uboot.git/blobdiff - include/configs/tqma6.h
arm: mx6: tqma6: Fix USB and add other filesystems
[karo-tx-uboot.git] / include / configs / tqma6.h
index 2705d2c55febe2b7d7f9b1881ae63af37a8a85ba..5d2f7f52e7652e3f6163078f132a6f2a03fec248 100644 (file)
@@ -9,29 +9,29 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+
+/* SPL */
+/* #if defined(CONFIG_SPL_BUILD) */
+
+#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_FAT_SUPPORT
+#define CONFIG_SPL_EXT_SUPPORT
+
+/* common IMX6 SPL configuration */
+#include "imx6_spl.h"
+
+/* #endif */
+
 #include "mx6_common.h"
 #include <asm/arch/imx-regs.h>
 #include <asm/imx-common/gpio.h>
 #include <linux/sizes.h>
 
-#define CONFIG_MX6
-
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
 #define PHYS_SDRAM_SIZE                        (512u * SZ_1M)
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
 #define PHYS_SDRAM_SIZE                        (1024u * SZ_1M)
 #endif
 
-#if defined(CONFIG_MBA6)
-
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
-#define CONFIG_DEFAULT_FDT_FILE                "imx6dl-mba6x.dtb"
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
-#define CONFIG_DEFAULT_FDT_FILE                "imx6q-mba6x.dtb"
-#endif
-
-#endif
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
+#define TQMA6_SPI_FLASH_SECTOR_SIZE    SZ_64K
+
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_BUS  0
-#define CONFIG_SF_DEFAULT_CS   (0 | (IMX_GPIO_NR(3, 19) << 8))
+#define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED        50000000
 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
 
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_I2C_MULTI_BUS
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* I2C SYSMON (LM75) */
 #define CONFIG_DTT_LM75
-#if defined(CONFIG_MBA6)
-#define CONFIG_DTT_SENSORS             { 0, 1 }
-#else
-#define CONFIG_DTT_SENSORS             { 0 }
-#endif
 #define CONFIG_DTT_MAX_TEMP            70
 #define CONFIG_DTT_MIN_TEMP            -30
 #define CONFIG_DTT_HYSTERESIS  3
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
-#define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 
 /* Fuses */
 #define CONFIG_MXC_OCOTP
 #define CONFIG_CMD_FUSE
 
 #define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_PING
 #define CONFIG_PHYLIB
 #define CONFIG_MII
 
-#if defined(CONFIG_MBA6)
-
-#define CONFIG_FEC_XCV_TYPE            RGMII
-#define CONFIG_ETHPRIME                        "FEC"
-
-#define CONFIG_FEC_MXC_PHYADDR         0x03
-#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_KSZ9031
-
-#else
-
-#error "define PHY to use for your baseboard"
-
-#endif
-
 #define CONFIG_ARP_TIMEOUT             200UL
 /* Network config - Allow larger/faster download for TFTP/NFS */
 #define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE  4096
 #define CONFIG_NFS_READ_SIZE   4096
 
-#if defined(CONFIG_MBA6)
-
-#define CONFIG_MXC_UART_BASE           UART2_BASE
-#define CONFIG_CONSOLE_DEV             "ttymxc1"
-
-#else
-
-#error "define baseboard specific things (uart, number of SD-card slots)"
-
-#endif
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_LOADADDR                        0x12000000
 
 /* place code in last 4 MiB of RAM */
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
 #define CONFIG_SYS_TEXT_BASE           0x2fc00000
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
 #define CONFIG_SYS_TEXT_BASE           0x4fc00000
 #endif
 
 
 #elif defined(CONFIG_TQMA6X_SPI_BOOT)
 
-#define CONFIG_FLASH_SECTOR_SIZE       0x10000
-
 #define TQMA6_UBOOT_OFFSET             0x400
 #define TQMA6_UBOOT_SECTOR_START       0x0
 /* max u-boot size: 512k */
-#define TQMA6_UBOOT_SECTOR_SIZE                CONFIG_FLASH_SECTOR_SIZE
+#define TQMA6_UBOOT_SECTOR_SIZE                TQMA6_SPI_FLASH_SECTOR_SIZE
 #define TQMA6_UBOOT_SECTOR_COUNT       0x8
 #define TQMA6_UBOOT_SIZE               (TQMA6_UBOOT_SECTOR_SIZE * \
                                         TQMA6_UBOOT_SECTOR_COUNT)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_ENV_OFFSET              (TQMA6_UBOOT_SIZE)
-#define CONFIG_ENV_SECT_SIZE           CONFIG_FLASH_SECTOR_SIZE
+#define CONFIG_ENV_SECT_SIZE           TQMA6_SPI_FLASH_SECTOR_SIZE
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                         CONFIG_ENV_SECT_SIZE)
 
 
 #define TQMA6_FDT_OFFSET               (CONFIG_ENV_OFFSET_REDUND + \
                                         CONFIG_ENV_SECT_SIZE)
-#define TQMA6_FDT_SECT_SIZE            (CONFIG_FLASH_SECTOR_SIZE)
+#define TQMA6_FDT_SECT_SIZE            (TQMA6_SPI_FLASH_SECTOR_SIZE)
 
 #define TQMA6_FDT_SECTOR_START         0x0a /* 8 Sector u-boot, 2 Sector env */
 #define TQMA6_FDT_SECTOR_COUNT         0x01
                        "setexpr blkc ${filesize} + "                          \
                                __stringify(TQMA6_UBOOT_OFFSET) "; "           \
                        "setexpr size ${uboot_sectors} * "                     \
-                               __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "      \
+                               __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
                        "if itest ${blkc} <= ${size}; then "                   \
                                "sf probe; "                                   \
                                "sf erase 0 ${size}; "                         \
        "update_kernel=run kernel_name; if tftp ${kernel}; then "              \
                "if itest ${filesize} > 0; then "                              \
                        "setexpr size ${kernel_sectors} * "                    \
-                               __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "      \
+                               __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
                        "setexpr offset ${kernel_start} * "                    \
-                               __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "      \
+                               __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
                        "if itest ${filesize} <= ${size}; then "               \
                                "sf probe; "                                   \
                                "sf erase ${offset} ${size}; "                 \
        "update_fdt=if tftp ${fdt_file}; then "                                \
                "if itest ${filesize} > 0; then "                              \
                        "setexpr size ${fdt_sectors} * "                       \
-                               __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "      \
+                               __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
                        "setexpr offset ${fdt_start} * "                       \
-                               __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "      \
+                               __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "   \
                        "if itest ${filesize} <= ${size}; then "               \
                                "sf probe; "                                   \
                                "sf erase ${offset} ${size}; "                 \
                "setenv filesize 0; setenv size ; setenv offset\0"             \
        "loadimage=sf probe; "                                                 \
                "setexpr size ${kernel_sectors} * "                            \
-                       __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "              \
+                       __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
                "setexpr offset ${kernel_start} * "                            \
-                       __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "              \
+                       __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
                "sf read ${loadaddr} ${offset} ${size}; "                      \
                "setenv size ; setenv offset\0"                                \
        "loadfdt=sf probe; "                                                   \
                "setexpr size ${fdt_sectors} * "                               \
-                       __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "              \
+                       __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
                "setexpr offset ${fdt_start} * "                               \
-                       __stringify(CONFIG_FLASH_SECTOR_SIZE)"; "              \
+                       __stringify(TQMA6_SPI_FLASH_SECTOR_SIZE)"; "           \
                "sf read ${${fdt_addr}} ${offset} ${size}; "                   \
                "setenv size ; setenv offset\0"                                \
 
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-#define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               (128u * SZ_1K)
 #define CONFIG_CMD_CACHE
 #endif
 
+/*
+ * All the defines above are for the TQMa6 SoM
+ *
+ * Now include the baseboard specific configuration
+ */
+#ifdef CONFIG_MBA6
+#include "tqma6_mba6.h"
+#else
+#error "No baseboard for the TQMa6 defined!"
+#endif
+
+/* Support at least the sensor on TQMa6 SOM */
+#if !defined(CONFIG_DTT_SENSORS)
+#define CONFIG_DTT_SENSORS             { 0 }
+#endif
+
 #endif /* __CONFIG_H */