diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-02-01 12:50:09 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-02-01 13:27:22 +0100 |
| commit | 8b73bfd8ecc23aee20f447adf18876c4f8373492 (patch) | |
| tree | 73686a4734721ea97825d9705544c757c4a19657 | |
| parent | f13d8fc9a7e999c7ddec2ecb25ab9501693a4f74 (diff) | |
linux-toradex: configure IPv6 SIT driver as module
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>
(cherry picked from meta-toradex-nxp commit
18a87021f079a84171885c6e816fb8800ce3b974 limited to
recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig resp.
colibri-imx6/defconfig)
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig | 4 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig | 4 |
2 files changed, 4 insertions, 4 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 |