summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHarninder Rai <harninder.rai@freescale.com>2014-04-22 12:14:25 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2014-05-07 21:58:27 (GMT)
commitb774c03581fde4389768aef078aa3b1d74883ffc (patch)
treee4f04af9441807f549ce22bfa87100967c1118e1 /arch
parentbe673ad57b22d8992c8ad280509969f937a28073 (diff)
downloadlinux-fsl-qoriq-b774c03581fde4389768aef078aa3b1d74883ffc.tar.xz
powerpc/defconfig: Disable NETFILTER config flag
This patch disables CONFIG_NETFILTER from 913x defconfigs. This flag is used by Application Specific Fastpath(ASF) but ASF is not enabled in these configs so no point enabling it Signed-off-by: Harninder Rai <harninder.rai@freescale.com> Change-Id: I699da60d33ac89e682aa8528f800aa696ee54326 Reviewed-on: http://git.am.freescale.net:8181/11921 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Naveen Burmi <NaveenBurmi@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/configs/85xx/bsc913x_defconfig11
-rw-r--r--arch/powerpc/configs/85xx/bsc913x_smp_defconfig11
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/powerpc/configs/85xx/bsc913x_defconfig b/arch/powerpc/configs/85xx/bsc913x_defconfig
index b9bcb46..be14cc0 100644
--- a/arch/powerpc/configs/85xx/bsc913x_defconfig
+++ b/arch/powerpc/configs/85xx/bsc913x_defconfig
@@ -62,17 +62,6 @@ CONFIG_INET_IPCOMP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
CONFIG_INET6_AH=y
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NETFILTER_XT_MATCH_HL=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_MANGLE=y
CONFIG_BRIDGE=y
CONFIG_VLAN_8021Q=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
diff --git a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig
index 4ba3944..a108997 100644
--- a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig
+++ b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig
@@ -64,17 +64,6 @@ CONFIG_INET_IPCOMP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
CONFIG_INET6_AH=y
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NETFILTER_XT_MATCH_HL=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_MANGLE=y
CONFIG_BRIDGE=y
CONFIG_VLAN_8021Q=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"