summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-12-04 08:15:33 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-22 17:04:09 +0100
commit9b6d7fa5ad66e522e9ae1481c0e04fd7e98cd279 (patch)
tree1210c0cb54ed77d98933fa4440ac7e30dc216637 /recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig
parentc4f34b34bf34f44b974a7add623cafff17d880ad (diff)
linux-toradex-rt: follow changes needed for backports
While at it add a config for colibri-imx6ull, add the Atmel touch driver and follow the move of the colibri-imx7 -> mx7 override in the non rt defconfig. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig')
-rw-r--r--recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig22
1 files changed, 10 insertions, 12 deletions
diff --git a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig
index bb849f3..c35d2ce 100644
--- a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig
@@ -128,10 +128,7 @@ CONFIG_NETDEVICES=y
CONFIG_MICREL_PHY=y
CONFIG_PPP=m
CONFIG_USB_USBNET=y
-CONFIG_RT2X00=m
-CONFIG_RT2800USB=m
-CONFIG_RTL8192CU=m
-# CONFIG_RTLWIFI_DEBUG is not set
+# CONFIG_RTL_CARDS is not set
CONFIG_INPUT_POLLDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
@@ -139,6 +136,7 @@ CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_IMX=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_FUSION_F0710A=m
CONFIG_TOUCHSCREEN_STMPE=y
CONFIG_INPUT_MISC=y
@@ -265,14 +263,6 @@ CONFIG_USB_CONFIGFS_EEM=y
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_LB_SS=y
CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
CONFIG_USB_ZERO=m
CONFIG_USB_ETH=m
CONFIG_USB_G_NCM=m
@@ -324,6 +314,13 @@ CONFIG_NTFS_FS=y
CONFIG_NTFS_RW=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
@@ -373,6 +370,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=y
CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
+CONFIG_CRC_CCITT=y
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m