From 1cb425d3e668e3d2b77872d5440fffd87ac9cf21 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 8 Nov 2016 15:16:55 -0800 Subject: apalis-tk1: 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 Acked-by: Marcel Ziswiler --- arch/arm/configs/apalis-tk1_defconfig | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'arch/arm/configs/apalis-tk1_defconfig') diff --git a/arch/arm/configs/apalis-tk1_defconfig b/arch/arm/configs/apalis-tk1_defconfig index 67eb86ee8fc3..87a3d3901fbc 100644 --- a/arch/arm/configs/apalis-tk1_defconfig +++ b/arch/arm/configs/apalis-tk1_defconfig @@ -27,7 +27,6 @@ CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y -CONFIG_EFI_PARTITION=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_TEGRA=y @@ -90,6 +89,7 @@ CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y +CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETFILTER=y @@ -146,9 +146,6 @@ CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y CONFIG_CAN=y -CONFIG_CAN_RAW=y -CONFIG_CAN_BCM=y -CONFIG_CAN_DEV=y CONFIG_CAN_MCP251X=y CONFIG_BT=m CONFIG_BT_RFCOMM=m @@ -159,7 +156,6 @@ CONFIG_CFG80211=m CONFIG_NL80211_TESTMODE=y CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m -CONFIG_MAC80211_LEDS=y CONFIG_RFKILL=m CONFIG_RFKILL_GPIO=m CONFIG_CAIF=y @@ -246,7 +242,6 @@ CONFIG_SERIAL_8250_NR_UARTS=9 CONFIG_SERIAL_8250_RUNTIME_UARTS=9 CONFIG_SERIAL_TEGRA=y # CONFIG_HW_RANDOM is not set -CONFIG_I2C=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y # CONFIG_I2C_HELPER_AUTO is not set @@ -254,7 +249,6 @@ CONFIG_I2C_TEGRA=y CONFIG_SPI=y CONFIG_SPI_TEGRA114=y CONFIG_SPI_SPIDEV=y -CONFIG_PPS=y CONFIG_PINCTRL_AS3722=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y @@ -290,9 +284,9 @@ CONFIG_TEGRA_NVAVP_AUDIO=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_VIDEO_TEGRA=m -CONFIG_SOC_CAMERA_AP1302=m CONFIG_SOC_CAMERA_AR0261=m CONFIG_SOC_CAMERA_AR0330=m +CONFIG_SOC_CAMERA_AP1302=m CONFIG_SOC_CAMERA_IMX135=m CONFIG_SOC_CAMERA_OV5640=m CONFIG_SOC_CAMERA_TC358743=m @@ -367,11 +361,9 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_TEGRA=y #TBD CONFIG_MMC_SDHCI_TEGRA_HS200_DISABLE=y -CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y -CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_SWITCH=y @@ -384,7 +376,6 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_STAGING=y #TBD CONFIG_AS3722_ADC_EXTCON=y -CONFIG_SYNC=y CONFIG_SW_SYNC=y CONFIG_SW_SYNC_USER=y CONFIG_TEGRA_MC_DOMAINS=y @@ -429,7 +420,6 @@ CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=m CONFIG_NLS_UTF8=y CONFIG_PRINTK_TIME=y -# CONFIG_MAGIC_SYSRQ is not set CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_LOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set @@ -446,8 +436,6 @@ CONFIG_FUNCTION_TRACER=y # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_DYNAMIC_DEBUG=y CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_TWOFISH=m # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_TEGRA_SE=y -- cgit v1.2.3