linux-toradex: configure IPv6 SIT driver as moduleApalis_TK1_LinuxImageV2.6.1Beta2_20161122

SIT tunnels (IPv6 over IPv4) are not often used hence configure
the driver as a module. This also gets rid of the extra network
interface sit0 by default.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>

5 files changed, 14 insertions, 12 deletions

diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig
index cb596a2..b16d464 100644
--- a/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig
@@ -67,6 +67,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_CAN=y
 CONFIG_CAN_VCAN=y
@@ -195,8 +196,8 @@ CONFIG_VIDEO_MXC_CAPTURE=m
 CONFIG_MXC_CAMERA_OV5640=m
 CONFIG_MXC_CAMERA_OV5642=m
 CONFIG_MXC_CAMERA_OV5640_MIPI=m
-CONFIG_MXC_TVIN_ADV7280=m
 CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_TVIN_ADV7280=m
 CONFIG_MXC_TVIN_MAX9526=m
 CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
 CONFIG_VIDEO_MXC_IPU_OUTPUT=y
@@ -271,7 +272,6 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MXC_IPU=y
 CONFIG_MXC_GPU_VIV=y
 CONFIG_MXC_MIPI_CSI2=y
-CONFIG_MXC_MLB150=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig
index beb14c6..836220c 100644
--- a/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig
@@ -63,6 +63,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_CAN=y
 CONFIG_CAN_VCAN=y
@@ -190,8 +191,8 @@ CONFIG_VIDEO_MXC_CAPTURE=m
 CONFIG_MXC_CAMERA_OV5640=m
 CONFIG_MXC_CAMERA_OV5642=m
 CONFIG_MXC_CAMERA_OV5640_MIPI=m
-CONFIG_MXC_TVIN_ADV7280=m
 CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_TVIN_ADV7280=m
 CONFIG_MXC_TVIN_MAX9526=m
 CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
 CONFIG_VIDEO_MXC_IPU_OUTPUT=y
@@ -261,7 +262,6 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MXC_IPU=y
 CONFIG_MXC_GPU_VIV=y
 CONFIG_MXC_MIPI_CSI2=y
-CONFIG_MXC_MLB150=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
diff --git a/recipes-kernel/linux/linux-toradex-4.1.15/defconfig b/recipes-kernel/linux/linux-toradex-4.1.15/defconfig
index 9bc32e3..0334edd 100644
--- a/recipes-kernel/linux/linux-toradex-4.1.15/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.1.15/defconfig
@@ -69,6 +69,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
diff --git a/recipes-kernel/linux/linux-toradex-4.1/defconfig b/recipes-kernel/linux/linux-toradex-4.1/defconfig
index 45f2421..46e0bf0 100644
--- a/recipes-kernel/linux/linux-toradex-4.1/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.1/defconfig
@@ -57,6 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
@@ -212,7 +213,6 @@ CONFIG_SND=y
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_SAI=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_FSL_SAI_WM9712=y
 CONFIG_HIDRAW=y
@@ -221,6 +221,7 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ACM=m
+CONFIG_USB_WDM=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -230,6 +231,7 @@ CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_FTDI_SIO=y
 CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_SERIAL_OPTION=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
@@ -269,7 +271,6 @@ CONFIG_FSL_EDMA=y
 CONFIG_EXTCON=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
-CONFIG_IIO_TRIGGER=y
 CONFIG_VF610_ADC=y
 CONFIG_PWM=y
 CONFIG_PWM_FSL_FTM=y
diff --git a/recipes-kernel/linux/linux-toradex-4.4/defconfig b/recipes-kernel/linux/linux-toradex-4.4/defconfig
index df1e04e..90d315b 100644
--- a/recipes-kernel/linux/linux-toradex-4.4/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.4/defconfig
@@ -57,6 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
@@ -162,6 +163,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
 # CONFIG_SERIO is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
+CONFIG_VF610_SEMA4=y
 CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_HW_RANDOM=y
@@ -270,6 +272,10 @@ CONFIG_FSL_EDMA=y
 # CONFIG_MX3_IPU is not set
 CONFIG_ARM_TIMER_SP804=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_VF610_CM4_RPROC=m
+CONFIG_IMX_RPMSG_PINGPONG=m
+CONFIG_IMX_RPMSG_TTY=m
+CONFIG_VF610_RPMSG=m
 CONFIG_SOC_BUS_VF610=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
@@ -321,9 +327,3 @@ CONFIG_XZ_DEC=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-CONFIG_VF610_SEMA4=y
-CONFIG_VIRTIO=m
-CONFIG_VF610_CM4_RPROC=m
-CONFIG_IMX_RPMSG_PINGPONG=m
-CONFIG_IMX_RPMSG_TTY=m
-CONFIG_VF610_RPMSG=m