karo: tx6: enable vsnprintf for safer string operations

[karo-tx-uboot.git] / board / karo / tx6 / Kconfig

diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig
index 702fc0c4f845ba8072ffec6fdea772bdb2aaf146..2c38e6af05dd4970949b313fb7ac136dea876ea2 100644 (file)
--- a/board/karo/tx6/Kconfig
+++ b/board/karo/tx6/Kconfig
@@ -24,14 +24,14 @@ config TX6
        select DM_THERMAL
        select FSL_ESDHC if MMC
        select FSL_USDHC if MMC
+       select IMX6_THERMAL
        select LIB_RAND
        select PHYLIB
-       select SYS_I2C
-       select SYS_I2C_MXC
        select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
        select MXC_OCOTP if CMD_FUSE
        select OF_BOARD_SETUP
        select OF_LIBFDT
+       select SYS_VSNPRINTF
 
 config TX6_NAND
        bool
@@ -52,6 +52,18 @@ config TX6_EMMC
        select MMC
        select SUPPORT_EMMC_BOOT
 
+config BOARD_TX6UL
+       bool
+       select SYS_I2C
+       select SYS_I2C_SOFT
+       select SYS_SDRAM_BUS_WIDTH_16
+       help
+         Common settings for TX6UL with i.MX6UL and i.MX6ULL.
+         Selected by TARGET_TX6UL_EMMC or TARGET_TX6UL_NAND.
+
+config TX6QP
+       bool
+
 #
 # variables selected depending on module variant
 #
@@ -64,71 +76,87 @@ config SYS_SDRAM_BUS_WIDTH_16
 config SYS_SDRAM_BUS_WIDTH_32
        bool
 
+config SYS_SDRAM_CHIP_SIZE
+       int "SDRAM chip size in MiB"
 
 choice
        prompt "TX6 module variant"
 
-config TARGET_TX6Q_1020
-       bool "TX6Q-1020"
+config TARGET_TX6Q_NAND
+       bool "TX6Q modules with NAND flash (TX6Q-1030/TX6Q-1130)"
        select SOC_MX6Q
-       select TX6_EMMC
+       select SYS_I2C
+       select SYS_I2C_MXC
 
-config TARGET_TX6Q_1033
-       bool "TX6Q-1033"
+config TARGET_TX6Q_EMMC
+       bool "TX6Q modules with eMMC (TX6Q-1036)"
        select SOC_MX6Q
+       select SYS_I2C
+       select SYS_I2C_MXC
        select TX6_EMMC
 
-config TARGET_TX6Q_10X0
-       bool "TX6Q-1010 and TX6Q-1030"
-       select SOC_MX6Q
-
-config TARGET_TX6Q_11X0
-       bool "TX6Q-1110 and TX6Q-1130"
-       select SOC_MX6Q
-       select SYS_LVDS_IF
-       
-config TARGET_TX6S_8034
-       bool "TX6S-8034"
+config TARGET_TX6S_NAND
+       bool "TX6S modules with NAND flash (TX6S-8034/TX6S-8134)"
        select SOC_MX6S
-       select SYS_SDRAM_BUS_WIDTH_16
+       select SYS_I2C
+       select SYS_I2C_MXC
 
-config TARGET_TX6S_8035
-       bool "TX6S-8035"
+config TARGET_TX6S_EMMC
+       bool "TX6S modules with eMMC (TX6S-8035/TX6S-8135)"
        select SOC_MX6S
+       select SYS_I2C
+       select SYS_I2C_MXC
        select TX6_EMMC
-       select SYS_SDRAM_BUS_WIDTH_32
 
-config TARGET_TX6U_8011
-       bool "TX6U-8011"
+config TARGET_TX6U_NAND
+       bool "TX6U (i.MX6DL) modules with NAND flash (TX6U-8030/TX6U-8032)"
        select SOC_MX6DL
-       select SYS_SDRAM_BUS_WIDTH_32
+       select SYS_I2C
+       select SYS_I2C_MXC
 
-config TARGET_TX6U_8012
-       bool "TX6U-8012"
+config TARGET_TX6U_EMMC
+       bool "TX6U (i.MX6DL) modules with eMMC (TX6U-8033/TX6U-8133)"
        select SOC_MX6DL
+       select SYS_I2C
+       select SYS_I2C_MXC
+       select TX6_EMMC
 
-config TARGET_TX6U_8033
-       bool "TX6U-8033"
-       select SOC_MX6DL
+config TARGET_TX6UL_NAND
+       bool "TXUL (i.MX6UL) modules with NAND flash (TXUL-5010)"
+       select BOARD_TX6UL
+
+config TARGET_TX6UL_EMMC
+       bool "TXUL (i.MX6UL) modules with eMMC (TXUL-5011)"
+       select BOARD_TX6UL
        select TX6_EMMC
 
-config TARGET_TX6U_80X0
-       bool "TX6U-8010 and TX6U-8030"
-       select SOC_MX6DL
+config TARGET_TX6QP_EMMC
+       bool "TX6Q modules with i.MX6Q+ and eMMC (TX6QP-8037)"
+       select SOC_MX6Q
+       select SYS_I2C
+       select SYS_I2C_MXC
+       select TX6_EMMC
+       select TX6QP
 
-config TARGET_TX6U_8111
-       bool "TX6U-8111"
-       select SOC_MX6DL
-       select SYS_SDRAM_BUS_WIDTH_32
-       select SYS_LVDS_IF
+endchoice
 
-config TARGET_TX6U_81X0
-       bool "TX6U-8110 and TX6U-8130"
-       select SOC_MX6DL
-       select SYS_LVDS_IF
+if BOARD_TX6UL
+
+choice
+       prompt "TX6UL SOC variant"
+
+config TX6UL
+       bool "i.MX6UL"
+       select SOC_MX6UL
+
+config TX6ULL
+       bool "i.MX6ULL"
+       select SOC_MX6ULL
 
 endchoice
 
+endif
+
 choice
        prompt "U-Boot image variant"
        default TX6_UBOOT