From f8b0fd9bee47cba12688391f5c3816e0b0ba6627 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 8 May 2020 23:10:57 +0300 Subject: linux-toradex-rt: sync defconfigs Basically, as per the following commit from the toradex_4.9-2.3.x-imx branch on git://git.toradex.com/linux-toradex.git 26e8afd3bb1614a04e11a75fff824b2ab7f6c4d6 apalis/colibri_imx6_defconfig: re-order kernel configurations 7eca4e0269d10cf9631eb66630e75109a067547d apalis/colibri imx6/7/ull: defconfig: Add nf_filter 8a6d56b0d9d096b97ef5d4d39a31fb9b00e39174 ARM: apalis/colibri-imx6/7/6ull: enable options required for backports 61b327f5600e76de0c9c42c780fcfb5d4b41b5a8 ARM: apalis/colibri-imx6/7/6ull: disable wireless drivers Related-to: ELB-2724 Signed-off-by: Oleksandr Suvorov --- .../linux/linux-toradex-rt-4.9-2.3.x/colibri-imx6ull/defconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/colibri-imx6ull/defconfig') diff --git a/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/colibri-imx6ull/defconfig index 0d35162..94b05aa 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/colibri-imx6ull/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/colibri-imx6ull/defconfig @@ -30,6 +30,7 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_MODULE_SIG=y # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_MXC=y CONFIG_SOC_IMX6ULL=y @@ -81,9 +82,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 @@ -103,9 +106,8 @@ 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_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_DEVTMPFS=y @@ -333,6 +335,7 @@ CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_ROOT_NFS=y +CONFIG_RPCSEC_GSS_KRB5=m CONFIG_CIFS=y CONFIG_NLS_DEFAULT="cp437" CONFIG_NLS_CODEPAGE_437=y -- cgit v1.2.3