From c6fb028aa5ae79ac69d388f81f74f1c860a0878c Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 8 May 2020 22:47:44 +0300 Subject: linux-toradex: 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-toradex-4.9-2.3.x/apalis-imx6/defconfig | 18 +++++++++++------- .../linux-toradex-4.9-2.3.x/colibri-imx6/defconfig | 16 ++++++++++------ .../linux-toradex-4.9-2.3.x/colibri-imx6ull/defconfig | 9 ++++++--- .../linux/linux-toradex-4.9-2.3.x/mx7/defconfig | 9 +++++---- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/apalis-imx6/defconfig index 657a5bd..f78c751 100644 --- a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/apalis-imx6/defconfig @@ -21,6 +21,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_IMX6Q=y @@ -62,6 +63,10 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_IPV6_SIT=m CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_FILTER=y CONFIG_CAN=y CONFIG_CAN_VCAN=y CONFIG_CAN_FLEXCAN=y @@ -74,8 +79,8 @@ CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y -CONFIG_CFG80211=m -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_GPIO=y CONFIG_DEVTMPFS=y @@ -128,7 +133,7 @@ CONFIG_NETDEVICES=y CONFIG_MICREL_PHY=y CONFIG_PPP=m CONFIG_USB_USBNET=y -# CONFIG_RTL_CARDS is not set +# CONFIG_WLAN is not set CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y @@ -181,6 +186,8 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y CONFIG_VIDEO_MXC_CAPTURE=m +CONFIG_VIDEO_MXC_CSI_CAMERA=m +CONFIG_MXC_VADC=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m @@ -190,8 +197,6 @@ CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y -CONFIG_VIDEO_MXC_CSI_CAMERA=m -CONFIG_MXC_VADC=m CONFIG_SOC_CAMERA=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_DVB_AU8522_V4L is not set @@ -269,8 +274,8 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y +CONFIG_MXC_IPU=y CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -361,7 +366,6 @@ CONFIG_CRYPTO_RMD128=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_RMD256=y CONFIG_CRYPTO_RMD320=y -CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_WP512=y diff --git a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6/defconfig index e596873..eba07a7 100644 --- a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6/defconfig @@ -21,6 +21,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_IMX6Q=y @@ -59,6 +60,10 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_IPV6_SIT=m CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_FILTER=y CONFIG_CAN=y CONFIG_CAN_VCAN=y CONFIG_CAN_FLEXCAN=y @@ -72,8 +77,8 @@ CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y -CONFIG_CFG80211=m -CONFIG_MAC80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_PRIV=y CONFIG_RFKILL=y CONFIG_RFKILL_GPIO=y CONFIG_DEVTMPFS=y @@ -177,6 +182,8 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_MXC_OUTPUT=y CONFIG_VIDEO_MXC_CAPTURE=m +CONFIG_VIDEO_MXC_CSI_CAMERA=m +CONFIG_MXC_VADC=m CONFIG_MXC_CAMERA_OV5640=m CONFIG_MXC_CAMERA_OV5642=m CONFIG_MXC_CAMERA_OV5640_MIPI=m @@ -186,8 +193,6 @@ CONFIG_MXC_TVIN_MAX9526=m CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m CONFIG_VIDEO_MXC_IPU_OUTPUT=y CONFIG_VIDEO_MXC_PXP_V4L2=y -CONFIG_VIDEO_MXC_CSI_CAMERA=m -CONFIG_MXC_VADC=m CONFIG_SOC_CAMERA=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_DVB_AU8522_V4L is not set @@ -261,8 +266,8 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y +CONFIG_MXC_IPU=y CONFIG_MXC_MIPI_CSI2=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -354,7 +359,6 @@ CONFIG_CRYPTO_RMD128=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_RMD256=y CONFIG_CRYPTO_RMD320=y -CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_WP512=y diff --git a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6ull/defconfig b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6ull/defconfig index 18cd125..898c03f 100644 --- a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6ull/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/colibri-imx6ull/defconfig @@ -29,6 +29,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 @@ -80,9 +81,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 @@ -102,9 +105,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 @@ -332,6 +334,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 diff --git a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/mx7/defconfig b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/mx7/defconfig index b9195e2..44e0a0d 100644 --- a/recipes-kernel/linux/linux-toradex-4.9-2.3.x/mx7/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.9-2.3.x/mx7/defconfig @@ -28,6 +28,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_IMX7D=y @@ -79,9 +80,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 @@ -101,9 +104,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 @@ -369,7 +371,6 @@ CONFIG_CRYPTO_RMD128=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_RMD256=y CONFIG_CRYPTO_RMD320=y -CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_WP512=y -- cgit v1.2.3