From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 30 Apr 2014 11:18:36 +0000 (+0200)
Subject: arm: imx6: defconfig: update tx6 defconfigs
X-Git-Tag: KARO-TX6-2014-04-30
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain

arm: imx6: defconfig: update tx6 defconfigs
---

diff --git a/arch/arm/configs/tx6-dbg_defconfig b/arch/arm/configs/tx6-dbg_defconfig
index c98feb6706b5..32ffb4fa37f0 100644
--- a/arch/arm/configs/tx6-dbg_defconfig
+++ b/arch/arm/configs/tx6-dbg_defconfig
@@ -6,6 +6,7 @@ CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
 CONFIG_RELAY=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
@@ -269,13 +270,19 @@ CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
+CONFIG_USB_ETH_EEM=y
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_HID=m
 CONFIG_MMC=m
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_TEST=m
@@ -326,6 +333,7 @@ CONFIG_UDF_FS=m
 CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
+CONFIG_CONFIGFS_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_SUMMARY=y
 CONFIG_JFFS2_COMPRESSION_OPTIONS=y
diff --git a/arch/arm/configs/tx6_defconfig b/arch/arm/configs/tx6_defconfig
index 89b75311a6ed..312b624b9f5e 100644
--- a/arch/arm/configs/tx6_defconfig
+++ b/arch/arm/configs/tx6_defconfig
@@ -5,6 +5,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
 CONFIG_RELAY=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
@@ -266,6 +267,7 @@ CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_USB_G_ACM_MS=m
 CONFIG_USB_G_HID=m
 CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_TEST=m