From 76f4fb2d08c1935dbacaf073f7c25b2acae82ab9 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 22 May 2020 18:24:15 +0300 Subject: linux-toradex-4.4: sync defconfigs Basically, as per the following commit from the toradex_vf_4.4-next branch on git://git.toradex.com/linux-toradex.git 25e7f6f94e42b16a6d5298122e1e4dee0e6bc5b6 colibri_vf_defconfig: add support of backports-5.4 Related-to: ELB-2724 Signed-off-by: Oleksandr Suvorov --- recipes-kernel/linux/linux-toradex-4.4/defconfig | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-4.4/defconfig b/recipes-kernel/linux/linux-toradex-4.4/defconfig index 37b937a..8a576db 100644 --- a/recipes-kernel/linux/linux-toradex-4.4/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.4/defconfig @@ -72,9 +72,11 @@ CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NFT_CHAIN_NAT_IPV4=y CONFIG_NFT_MASQ_IPV4=y CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_NAT=y CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_FILTER=y CONFIG_NF_TABLES_BRIDGE=y CONFIG_L2TP=m CONFIG_BRIDGE=y @@ -85,9 +87,8 @@ CONFIG_VLAN_8021Q_GVRP=y CONFIG_CAN=m CONFIG_CAN_FLEXCAN=m CONFIG_CAN_MCP251X=m -CONFIG_CFG80211=m -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_DEVTMPFS=y @@ -143,7 +144,6 @@ 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_WLAN is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -322,7 +322,13 @@ CONFIG_SECURITYFS=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_HW is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_CRC_CCITT=y CONFIG_CRC_T10DIF=y CONFIG_XZ_DEC=y -- cgit v1.2.3