]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 16:15:13 +0000 (12:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 16:15:13 +0000 (12:15 -0400)
1  2 
arch/arm/Kconfig
include/configs/gw_ventana.h
include/configs/nitrogen6x.h
include/configs/tqma6.h

diff --combined arch/arm/Kconfig
index 5f21b59ba813be88258a8b31877effd01d19cd0d,7c383cb89ab30cf9b2393b346529704a98a860bd..2167e29f6aba525f61f92635f1017e8699232668
@@@ -33,9 -33,6 +33,9 @@@ config CPU_V
          bool
          select HAS_VBAR
  
 +config CPU_V7M
 +      bool
 +
  config CPU_PXA
          bool
  
@@@ -50,7 -47,6 +50,7 @@@ config SYS_CP
          default "arm1136" if CPU_ARM1136
          default "arm1176" if CPU_ARM1176
          default "armv7" if CPU_V7
 +        default "armv7m" if CPU_V7M
          default "pxa" if CPU_PXA
          default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
@@@ -65,6 -61,18 +65,6 @@@ config SEMIHOSTIN
  choice
        prompt "Target select"
  
 -config TARGET_INTEGRATORAP_CM720T
 -      bool "Support integratorap_cm720t"
 -      select CPU_ARM720T
 -
 -config TARGET_INTEGRATORAP_CM920T
 -      bool "Support integratorap_cm920t"
 -      select CPU_ARM920T
 -
 -config TARGET_INTEGRATORCP_CM920T
 -      bool "Support integratorcp_cm920t"
 -      select CPU_ARM920T
 -
  config ARCH_AT91
        bool "Atmel AT91"
  
@@@ -84,6 -92,14 +84,6 @@@ config TARGET_SMDK241
        bool "Support smdk2410"
        select CPU_ARM920T
  
 -config TARGET_INTEGRATORAP_CM926EJS
 -      bool "Support integratorap_cm926ejs"
 -      select CPU_ARM926EJS
 -
 -config TARGET_INTEGRATORCP_CM926EJS
 -      bool "Support integratorcp_cm926ejs"
 -      select CPU_ARM926EJS
 -
  config TARGET_ASPENITE
        bool "Support aspenite"
        select CPU_ARM926EJS
@@@ -219,8 -235,6 +219,8 @@@ config TARGET_SPEAR60
  config TARGET_STV0991
        bool "Support stv0991"
        select CPU_V7
 +      select DM
 +      select DM_SERIAL
  
  config TARGET_X600
        bool "Support x600"
@@@ -231,6 -245,10 +231,6 @@@ config ARCH_VERSATIL
        bool "ARM Ltd. Versatile family"
        select CPU_ARM926EJS
  
 -config TARGET_INTEGRATORCP_CM1136
 -      bool "Support integratorcp_cm1136"
 -      select CPU_ARM1136
 -
  config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136
@@@ -275,9 -293,14 +275,9 @@@ config TARGET_MX35PD
  
  config ARCH_BCM283X
        bool "Broadcom BCM283X family"
 -
 -config TARGET_INTEGRATORAP_CM946ES
 -      bool "Support integratorap_cm946es"
 -      select CPU_ARM946ES
 -
 -config TARGET_INTEGRATORCP_CM946ES
 -      bool "Support integratorcp_cm946es"
 -      select CPU_ARM946ES
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
@@@ -307,33 -330,21 +307,33 @@@ config TARGET_CM_T33
        bool "Support cm_t335"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_PEPPER
        bool "Support pepper"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_AM335X_IGEP0033
        bool "Support am335x_igep0033"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_PCM051
        bool "Support pcm051"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_DRACO
        bool "Support draco"
@@@ -359,17 -370,11 +359,17 @@@ config TARGET_PENGWY
        bool "Support pengwyn"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
@@@ -380,8 -385,6 +380,8 @@@ config TARGET_BAV335
        bool "Support bav335x"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
        help
          The BAV335x OEM Network Processor integrates all the functions of an
          embedded network computer in a small, easy to use SODIMM module which
@@@ -416,26 -419,15 +416,26 @@@ config TARGET_BCMNS
  config ARCH_EXYNOS
        bool "Samsung EXYNOS"
        select CPU_V7
 +      select DM
 +      select DM_SPI_FLASH
 +      select DM_SERIAL
 +      select DM_SPI
 +      select DM_GPIO
  
  config ARCH_S5PC1XX
        bool "Samsung S5PC1XX"
        select CPU_V7
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config ARCH_HIGHBANK
        bool "Calxeda Highbank"
        select CPU_V7
  
 +config ARCH_INTEGRATOR
 +      bool "ARM Ltd. Integrator family"
 +
  config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
@@@ -525,16 -517,17 +525,21 @@@ config TARGET_MX6QARM
  config TARGET_MX6QSABREAUTO
        bool "Support mx6qsabreauto"
        select CPU_V7
 +      select DM
 +      select DM_THERMAL
  
  config TARGET_MX6SABRESD
        bool "Support mx6sabresd"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_THERMAL
  
+ config TARGET_MX6CUBOXI
+       bool "Support Solid-run mx6 boards"
+       select CPU_V7
+       select SUPPORT_SPL
  config TARGET_MX6SLEVK
        bool "Support mx6slevk"
        select CPU_V7
@@@ -543,8 -536,6 +548,8 @@@ config TARGET_MX6SXSABRES
        bool "Support mx6sxsabresd"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_THERMAL
  
  config TARGET_GW_VENTANA
        bool "Support gw_ventana"
@@@ -605,25 -596,16 +610,25 @@@ config TARGET_CM_FX
        bool "Support cm_fx6"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
  
  config TARGET_SOCFPGA_ARRIA5
        bool "Support socfpga_arria5"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SPI_FLASH
 +      select DM_SPI
  
  config TARGET_SOCFPGA_CYCLONE5
        bool "Support socfpga_cyclone5"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_SPI_FLASH
 +      select DM_SPI
  
  config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
@@@ -640,15 -622,10 +645,15 @@@ config TARGET_VF610TW
        bool "Support vf610twr"
        select CPU_V7
  
 +config TARGET_COLIBRI_VF
 +      bool "Support Colibri VF50/61"
 +      select CPU_V7
 +
  config ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
  
  config TARGET_XILINX_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
@@@ -660,12 -637,6 +665,12 @@@ config TEGR
        select SPL
        select OF_CONTROL
        select CPU_V7
 +      select DM
 +      select DM_SPI_FLASH
 +      select DM_SERIAL
 +      select DM_I2C
 +      select DM_SPI
 +      select DM_GPIO
  
  config TARGET_VEXPRESS64_AEMV8A
        bool "Support vexpress_aemv8a"
@@@ -690,28 -661,6 +695,28 @@@ config TARGET_LS2085A_SIM
        select ARM64
        select ARMV8_MULTIENTRY
  
 +config TARGET_LS2085AQDS
 +      bool "Support ls2085aqds"
 +      select ARM64
 +      select ARMV8_MULTIENTRY
 +      select SUPPORT_SPL
 +      help
 +        Support for Freescale LS2085AQDS platform
 +        The LS2085A Development System (QDS) is a high-performance
 +        development platform that supports the QorIQ LS2085A
 +        Layerscape Architecture processor.
 +
 +config TARGET_LS2085ARDB
 +      bool "Support ls2085ardb"
 +      select ARM64
 +      select ARMV8_MULTIENTRY
 +      select SUPPORT_SPL
 +      help
 +        Support for Freescale LS2085ARDB platform.
 +        The LS2085A Reference design board (RDB) is a high-performance
 +        development platform that supports the QorIQ LS2085A
 +        Layerscape Architecture processor.
 +
  config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
@@@ -782,13 -731,6 +787,13 @@@ config ARCH_UNIPHIE
        select SUPPORT_SPL
        select SPL
        select OF_CONTROL
 +      select DM
 +      select DM_SERIAL
 +      select DM_I2C
 +
 +config TARGET_STM32F429_DISCOVERY
 +      bool "Support STM32F429 Discovery"
 +      select CPU_V7M
  
  endchoice
  
@@@ -802,8 -744,6 +807,8 @@@ source "arch/arm/cpu/armv7/exynos/Kconf
  
  source "arch/arm/mach-highbank/Kconfig"
  
 +source "arch/arm/mach-integrator/Kconfig"
 +
  source "arch/arm/mach-keystone/Kconfig"
  
  source "arch/arm/mach-kirkwood/Kconfig"
@@@ -849,6 -789,7 +854,6 @@@ source "board/Marvell/db-mv784mp-gp/Kco
  source "board/Marvell/gplugd/Kconfig"
  source "board/altera/socfpga/Kconfig"
  source "board/armadeus/apf27/Kconfig"
 -source "board/armltd/integrator/Kconfig"
  source "board/armltd/vexpress/Kconfig"
  source "board/armltd/vexpress64/Kconfig"
  source "board/bachmann/ot1200/Kconfig"
@@@ -871,8 -812,6 +876,8 @@@ source "board/denx/m53evk/Kconfig
  source "board/embest/mx6boards/Kconfig"
  source "board/esg/ima3-mx53/Kconfig"
  source "board/freescale/ls2085a/Kconfig"
 +source "board/freescale/ls2085aqds/Kconfig"
 +source "board/freescale/ls2085ardb/Kconfig"
  source "board/freescale/ls1021aqds/Kconfig"
  source "board/freescale/ls1021atwr/Kconfig"
  source "board/freescale/mx23evk/Kconfig"
@@@ -922,6 -861,7 +927,7 @@@ source "board/siemens/draco/Kconfig
  source "board/siemens/pxm2/Kconfig"
  source "board/siemens/rut/Kconfig"
  source "board/silica/pengwyn/Kconfig"
+ source "board/solidrun/mx6cuboxi/Kconfig"
  source "board/solidrun/hummingboard/Kconfig"
  source "board/spear/spear300/Kconfig"
  source "board/spear/spear310/Kconfig"
@@@ -930,7 -870,6 +936,7 @@@ source "board/spear/spear600/Kconfig
  source "board/spear/x600/Kconfig"
  source "board/st-ericsson/snowball/Kconfig"
  source "board/st-ericsson/u8500/Kconfig"
 +source "board/st/stm32f429-discovery/Kconfig"
  source "board/st/stv0991/Kconfig"
  source "board/sunxi/Kconfig"
  source "board/syteco/zmx25/Kconfig"
@@@ -942,7 -881,6 +948,7 @@@ source "board/ti/ti814x/Kconfig
  source "board/ti/ti816x/Kconfig"
  source "board/timll/devkit3250/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
 +source "board/toradex/colibri_vf/Kconfig"
  source "board/tqc/tqma6/Kconfig"
  source "board/trizepsiv/Kconfig"
  source "board/ttcontrol/vision2/Kconfig"
index 9bc325003aa947498bb67443559362956b7196bd,684f3476a24ec070ff2c8d5fbeff1f400a70e2eb..fcfc1b36039fd223cacec537cb7c9cf45076622f
  #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_SYS_I2C_SPEED          100000
  #define CONFIG_I2C_GSC                        0
  #define CONFIG_I2C_PMIC                       1
+ #define CONFIG_I2C_EDID
  
  /* MMC Configs */
  #define CONFIG_FSL_ESDHC
  
  /* Filesystem support */
  #define CONFIG_CMD_EXT2
+ #define CONFIG_CMD_EXT4
+ #define CONFIG_CMD_EXT4_WRITE
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_UBIFS
  #define CONFIG_DOS_PARTITION
  
- /* Network config - Allow larger/faster download for TFTP/NFS */
- #define CONFIG_IP_DEFRAG
- #define CONFIG_TFTP_BLOCKSIZE 4096
- #define CONFIG_NFS_READ_SIZE  4096
  /*
   * SATA Configs
   */
  
  /* Ethernet support */
  #define CONFIG_FEC_MXC
+ #define CONFIG_E1000
  #define CONFIG_MII
  #define IMX_FEC_BASE             ENET_BASE_ADDR
  #define CONFIG_FEC_XCV_TYPE      RGMII
- #define CONFIG_ETHPRIME          "FEC"
  #define CONFIG_FEC_MXC_PHYADDR   0
  #define CONFIG_PHYLIB
  #define CONFIG_ARP_TIMEOUT       200UL
  #define CONFIG_NETCONSOLE
  #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
  
+ /* USB Mass Storage Gadget */
+ #define CONFIG_USB_GADGET
+ #define CONFIG_CMD_USB_MASS_STORAGE
+ #define CONFIG_USB_GADGET_MASS_STORAGE
+ #define CONFIG_USBDOWNLOAD_GADGET
+ #define CONFIG_USB_GADGET_VBUS_DRAW    2
+ /* Netchip IDs */
+ #define CONFIG_G_DNL_VENDOR_NUM 0x0525
+ #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
+ #define CONFIG_G_DNL_MANUFACTURER "Gateworks"
  /* Framebuffer and LCD */
  #define CONFIG_VIDEO
  #define CONFIG_VIDEO_IPUV3
        "dio0:mode=gpio;dio1:mode=gpio;dio2:mode=gpio;dio3:mode=gpio\0" \
  
  #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \
+       "usb_pgood_delay=2000\0" \
        "console=ttymxc1\0" \
        "bootdevs=usb mmc sata flash\0" \
        HWCONFIG_DEFAULT \
        \
        "fdt_high=0xffffffff\0" \
        "fdt_addr=0x18000000\0" \
+       "initrd_high=0xffffffff\0" \
+       "bootdir=boot\0" \
        "loadfdt=" \
-               "if ${fsload} ${fdt_addr} boot/${fdt_file}; then " \
-                       "echo Loaded DTB from boot/${fdt_file}; " \
-               "elif ${fsload} ${fdt_addr} boot/${fdt_file1}; then " \
-                       "echo Loaded DTB from boot/${fdt_file1}; " \
-               "elif ${fsload} ${fdt_addr} boot/${fdt_file2}; then " \
-                               "echo Loaded DTB from boot/${fdt_file2}; " \
+               "if ${fsload} ${fdt_addr} ${bootdir}/${fdt_file}; then " \
+                       "echo Loaded DTB from ${bootdir}/${fdt_file}; " \
+               "elif ${fsload} ${fdt_addr} ${bootdir}/${fdt_file1}; then " \
+                       "echo Loaded DTB from ${bootdir}/${fdt_file1}; " \
+               "elif ${fsload} ${fdt_addr} ${bootdir}/${fdt_file2}; then " \
+                       "echo Loaded DTB from ${bootdir}/${fdt_file2}; " \
                "fi\0" \
        \
-       "script=boot/6x_bootscript-ventana\0" \
+       "script=6x_bootscript-ventana\0" \
        "loadscript=" \
-               "if ${fsload} ${loadaddr} ${script}; then " \
+               "if ${fsload} ${loadaddr} ${bootdir}/${script}; then " \
                        "source; " \
                "fi\0" \
        \
-       "uimage=boot/uImage\0" \
+       "uimage=uImage\0" \
        "mmc_root=/dev/mmcblk0p1 rootfstype=ext4 rootwait rw\0" \
        "mmc_boot=" \
                "setenv fsload 'ext2load mmc 0:1'; " \
                "mmc dev 0 && mmc rescan && " \
                "run loadscript; " \
-               "if ${fsload} ${loadaddr} ${uimage}; then " \
+               "if ${fsload} ${loadaddr} ${bootdir}/${uimage}; then " \
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=/dev/mmcblk0p1 rootfstype=ext4 " \
                                "rootwait rw ${video} ${extra}; " \
        "sata_boot=" \
                "setenv fsload 'ext2load sata 0:1'; sata init && " \
                "run loadscript; " \
-               "if ${fsload} ${loadaddr} ${uimage}; then " \
+               "if ${fsload} ${loadaddr} ${bootdir}/${uimage}; then " \
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=/dev/sda1 rootfstype=ext4 " \
                                "rootwait rw ${video} ${extra}; " \
        "usb_boot=" \
                "setenv fsload 'ext2load usb 0:1'; usb start && usb dev 0 && " \
                "run loadscript; " \
-               "if ${fsload} ${loadaddr} ${uimage}; then " \
+               "if ${fsload} ${loadaddr} ${bootdir}/${uimage}; then " \
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=/dev/sda1 rootfstype=ext4 " \
                                "rootwait rw ${video} ${extra}; " \
  #else
        #define CONFIG_EXTRA_ENV_SETTINGS \
        CONFIG_EXTRA_ENV_SETTINGS_COMMON \
-       "image_rootfs=openwrt-imx6-ventana-rootfs.ubi\0" \
        \
+       "image_rootfs=openwrt-imx6-ventana-rootfs.ubi\0" \
        "nand_update=echo Updating NAND from ${serverip}:${image_rootfs}...; " \
                "tftp ${loadaddr} ${image_rootfs} && " \
                "nand erase.part rootfs && " \
        \
        "flash_boot=" \
                "setenv fsload 'ubifsload'; " \
-               "ubi part rootfs && ubifsmount ubi0:rootfs; " \
+               "ubi part rootfs; " \
+               "if ubi check boot; then " \
+                       "ubifsmount ubi0:boot; " \
+                       "setenv root ubi0:rootfs ubi.mtd=2 " \
+                               "rootfstype=squashfs,ubifs; " \
+                       "setenv bootdir; " \
+               "elif ubi check rootfs; then " \
+                       "ubifsmount ubi0:rootfs; " \
+                       "setenv root ubi0:rootfs ubi.mtd=2 " \
+                               "rootfstype=ubifs; " \
+               "fi; " \
                "run loadscript; " \
-               "if ${fsload} ${loadaddr} ${uimage}; then " \
+               "if ${fsload} ${loadaddr} ${bootdir}/${uimage}; then " \
                        "setenv bootargs console=${console},${baudrate} " \
-                               "root=ubi0:rootfs ubi.mtd=2 " \
-                               "rootfstype=ubifs ${video} ${extra}; " \
+                               "root=${root} ${video} ${extra}; " \
                        "if run loadfdt && fdt addr ${fdt_addr}; then " \
                                "ubifsumount; " \
                                "bootm ${loadaddr} - ${fdt_addr}; " \
index 883d8a771af8117c1f0529f6a09466c13ecdb831,0ca02e9f8bf7924a8b2eb5b47460130f478c5022..eaa2c2cd363d4ec4c5713187ad7b8ee0b4080f61
@@@ -63,7 -63,6 +63,7 @@@
  #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_SYS_I2C_SPEED          100000
  #define CONFIG_I2C_EDID
  
  #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
  #define CONFIG_VIDEO_BMP_RLE8
  #define CONFIG_SPLASH_SCREEN
+ #define CONFIG_SPLASH_SCREEN_ALIGN
+ #define CONFIG_VIDEO_BMP_GZIP
+ #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024)
  #define CONFIG_BMP_16BPP
  #define CONFIG_IPUV3_CLK 260000000
  #define CONFIG_CMD_HDMIDETECT
diff --combined include/configs/tqma6.h
index 99c5f82aa096f0661d82bad23c711b55951afeb5,526f0ecf1bd144b1155e357b7b29c17898130919..012fa1c242bb5f6b3781c6394cce166e44512bc3
  #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_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_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_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 */