summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-11-08 14:19:50 -0800
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-11 15:48:23 +0100
commit93fb63a36a3b7d9c75350a7e628ea38e67417b98 (patch)
treee419e8090a970f77076250ca08a28b68bdc5cc15 /arch/arm/configs
parent4a8d0855432d0467928ec46bae8813f831138674 (diff)
ARM: configs: colibri_vf: 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: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/colibri_vf_defconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/configs/colibri_vf_defconfig b/arch/arm/configs/colibri_vf_defconfig
index df1e04ef7358..90d315b63fa4 100644
--- a/arch/arm/configs/colibri_vf_defconfig
+++ b/arch/arm/configs/colibri_vf_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