summaryrefslogtreecommitdiff
path: root/arch/arm/configs/colibri_imx6_defconfig
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-11-08 14:16:22 -0800
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-01-31 15:18:07 +0100
commitfbe21c6046aa0a95ee5739e3d8ec3ba128e35d6b (patch)
tree35771bbf9576f2322028af001238d47c8a8314dd /arch/arm/configs/colibri_imx6_defconfig
parent3894f6d783c8f1d3a8381d3a9746bc8fc75036a6 (diff)
apalis_imx6/colibri_imx6: 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>
Diffstat (limited to 'arch/arm/configs/colibri_imx6_defconfig')
-rw-r--r--arch/arm/configs/colibri_imx6_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig
index beb14c6..836220c 100644
--- a/arch/arm/configs/colibri_imx6_defconfig
+++ b/arch/arm/configs/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