From 868c87f82e7af3d3de93f8ae3af0668f2c1390d1 Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Mon, 28 Aug 2017 14:18:18 +0000 Subject: linux-toradex: update defconfigs Adjust defconfigs for use with backports Signed-off-by: Dominik Sliwa Acked-by: Stefan Agner --- .../linux-toradex-4.1-2.0.x/apalis-imx6/defconfig | 6 ++---- .../linux-toradex-4.1-2.0.x/colibri-imx6/defconfig | 21 +++++++++------------ .../linux-toradex-4.1-2.0.x/colibri-imx7/defconfig | 17 +++-------------- recipes-kernel/linux/linux-toradex-4.4/defconfig | 12 ++++++------ 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig index a63dbf7..b6f6ed1 100644 --- a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/apalis-imx6/defconfig @@ -133,10 +133,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 @@ -378,6 +375,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 diff --git a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig index ea586ac..c6847de 100644 --- a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-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_WLAN is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -261,14 +258,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 @@ -322,6 +311,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 @@ -371,6 +367,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 diff --git a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx7/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx7/defconfig index 5c6f592..c6f82ba 100644 --- a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx7/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/colibri-imx7/defconfig @@ -97,16 +97,8 @@ CONFIG_VLAN_8021Q_GVRP=y CONFIG_CAN=m CONFIG_CAN_FLEXCAN=m CONFIG_CAN_MCP251X=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_LL=y CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y @@ -168,11 +160,7 @@ CONFIG_USB_USBNET=m # CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_CDC_SUBSET is not set # CONFIG_USB_NET_ZAURUS is not set -CONFIG_USB_ZD1201=m -CONFIG_RT2X00=m -CONFIG_RT2800USB=m -CONFIG_RTL8192CU=m -# CONFIG_RTLWIFI_DEBUG is not set +# CONFIG_WLAN is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -189,6 +177,7 @@ CONFIG_TOUCHSCREEN_FUSION_F0710A=m # CONFIG_DEVKMEM is not set CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_FSL_OTP=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set diff --git a/recipes-kernel/linux/linux-toradex-4.4/defconfig b/recipes-kernel/linux/linux-toradex-4.4/defconfig index 90d315b..1a3db57 100644 --- a/recipes-kernel/linux/linux-toradex-4.4/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.4/defconfig @@ -86,6 +86,7 @@ CONFIG_CAN=m CONFIG_CAN_FLEXCAN=m CONFIG_CAN_MCP251X=m CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y @@ -142,12 +143,7 @@ CONFIG_USB_USBNET=m # CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_CDC_SUBSET is not set # CONFIG_USB_NET_ZAURUS is not set -CONFIG_USB_ZD1201=m -CONFIG_RT2X00=m -CONFIG_RT2800USB=m -# CONFIG_RT2800USB_RT35XX is not set -CONFIG_RTL8192CU=m -# CONFIG_RTLWIFI_DEBUG is not set +# CONFIG_WLAN is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -321,7 +317,11 @@ CONFIG_STACKTRACE=y # CONFIG_FTRACE is not set # CONFIG_ARM_UNWIND is not set CONFIG_SECURITYFS=y +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_HW is not set +CONFIG_CRC_CCITT=y CONFIG_CRC_T10DIF=y CONFIG_XZ_DEC=y CONFIG_FONTS=y -- cgit v1.2.3