layerscape: Remove netfilter and LZ4 config symbols

These conflict with the kmod packages (such as nf-netlink)

Signed-off-by: Mathew McBride <matt@traverse.com.au>
[Add same changes for arm8_32b subtarget and refresh config]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/layerscape/armv8_32b/config-4.9 b/target/linux/layerscape/armv8_32b/config-4.9
index f0687f3804086b74d69270f06bf3e5286bfff18d..bb45901171dd06250a11fa809ab93d99744985c2 100644 (file)
--- a/target/linux/layerscape/armv8_32b/config-4.9
+++ b/target/linux/layerscape/armv8_32b/config-4.9
@@ -2,7 +2,6 @@ CONFIG_ABX500_CORE=y
 CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
 # CONFIG_AD525X_DPOT_SPI is not set
-CONFIG_ADVISE_SYSCALLS=y
 CONFIG_AHCI_IMX=y
 CONFIG_AHCI_QORIQ=y
 CONFIG_AK8975=y
@@ -304,7 +303,6 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZ4=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
@@ -524,7 +522,6 @@ CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_XILINX=y
-CONFIG_GRACE_PERIOD=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
@@ -669,11 +666,6 @@ CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_NAT=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=y
-# CONFIG_IP6_NF_TARGET_NPT is not set
 CONFIG_IPC_NS=y
 CONFIG_IPV6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -683,39 +675,10 @@ CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MROUTE is not set
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_RARP=y
-CONFIG_IP_VS=y
-# CONFIG_IP_VS_DEBUG is not set
-# CONFIG_IP_VS_DH is not set
-# CONFIG_IP_VS_FO is not set
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_LBLC is not set
-# CONFIG_IP_VS_LBLCR is not set
-# CONFIG_IP_VS_LC is not set
-# CONFIG_IP_VS_NFCT is not set
-# CONFIG_IP_VS_NQ is not set
-# CONFIG_IP_VS_OVF is not set
-# CONFIG_IP_VS_PROTO_AH is not set
-# CONFIG_IP_VS_PROTO_AH_ESP is not set
-# CONFIG_IP_VS_PROTO_ESP is not set
-# CONFIG_IP_VS_PROTO_SCTP is not set
-# CONFIG_IP_VS_PROTO_TCP is not set
-# CONFIG_IP_VS_PROTO_UDP is not set
-# CONFIG_IP_VS_RR is not set
-# CONFIG_IP_VS_SED is not set
-# CONFIG_IP_VS_SH is not set
-CONFIG_IP_VS_SH_TAB_BITS=8
-CONFIG_IP_VS_TAB_BITS=12
-# CONFIG_IP_VS_WLC is not set
-# CONFIG_IP_VS_WRR is not set
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_CROSSBAR=y
 CONFIG_IRQ_DOMAIN=y
@@ -759,14 +722,12 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LIBFDT=y
 CONFIG_LOCALVERSION_AUTO=y
-CONFIG_LOCKD=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MACB=y
@@ -896,49 +857,11 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_IPVS=y
-CONFIG_NETFILTER_XT_NAT=y
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
-CONFIG_NETLINK_DIAG=y
 # CONFIG_NET_CLS_CGROUP is not set
 CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_INGRESS=y
 CONFIG_NET_IP_TUNNEL=y
-CONFIG_NET_KEY=y
 CONFIG_NET_NS=y
-CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_SWITCHDEV=y
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_IPV6=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_RTCACHE is not set
-CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_DEFRAG_IPV6=y
-# CONFIG_NF_LOG_IPV6 is not set
-CONFIG_NF_NAT=y
-CONFIG_NF_NAT_IPV4=y
-CONFIG_NF_NAT_IPV6=y
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
-CONFIG_NF_NAT_MASQUERADE_IPV6=y
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_REDIRECT is not set
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
@@ -964,7 +887,6 @@ CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
-CONFIG_OID_REGISTRY=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
 # CONFIG_OMAP2PLUS_MBOX is not set
@@ -994,7 +916,6 @@ CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PACKET_DIAG=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PALMAS_GPADC is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -1094,7 +1015,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
-CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_RD_XZ=y
@@ -1147,7 +1067,6 @@ CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RFS_ACCEL=y
-CONFIG_ROOT_NFS=y
 CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AS3722=y
@@ -1254,7 +1173,6 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_CADENCE=y
-# CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_FSL_QUADSPI=y
 # CONFIG_SPI_IMX is not set
 CONFIG_SPI_MASTER=y
@@ -1278,8 +1196,6 @@ CONFIG_STMPE_I2C=y
 # CONFIG_STMPE_SPI is not set
 CONFIG_STMP_DEVICE=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SWIOTLB=y
@@ -1347,7 +1263,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PCI=y
-# CONFIG_USB_EHCI_FSL is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_EHCI_MXC is not set

diff --git a/target/linux/layerscape/armv8_64b/config-4.9 b/target/linux/layerscape/armv8_64b/config-4.9
index 91a89a25b95f3330c2473344b662273f0471bb3c..ea4dba67c089b3e79c875deb4cdeeeed451297ef 100644 (file)
--- a/target/linux/layerscape/armv8_64b/config-4.9
+++ b/target/linux/layerscape/armv8_64b/config-4.9
@@ -23,7 +23,6 @@ CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 CONFIG_ACPI_SPCR_TABLE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ADVISE_SYSCALLS=y
 CONFIG_AHCI_CEVA=y
 CONFIG_AHCI_QORIQ=y
 CONFIG_AHCI_XGENE=y
@@ -145,11 +144,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT=y
 # CONFIG_BPF_SYSCALL is not set
-CONFIG_BRIDGE_EBT_DNAT=y
-CONFIG_BRIDGE_EBT_SNAT=y
-CONFIG_BRIDGE_EBT_T_NAT=y
-CONFIG_BRIDGE_NETFILTER=y
-CONFIG_BRIDGE_NF_EBTABLES=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -318,7 +312,6 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZ4=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
@@ -691,11 +684,6 @@ CONFIG_IPV6=y
 CONFIG_IPV6_SIT=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MROUTE is not set
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_DHCP=y
@@ -748,7 +736,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LS_SCFG_MSI=y
 CONFIG_LS_SOC_DRIVERS=y
-CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MACB=y
@@ -845,76 +832,12 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=y
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_NETFILTER_XT_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_NAT=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 # CONFIG_NETLABEL is not set
-CONFIG_NETLINK_DIAG=y
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NET_9P=y
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_NET_9P_VIRTIO=y
 # CONFIG_NET_CLS_CGROUP is not set
 CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_INGRESS=y
 CONFIG_NET_IP_TUNNEL=y
-CONFIG_NET_KEY=y
 CONFIG_NET_NS=y
-CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NFT_CHAIN_NAT_IPV4 is not set
-# CONFIG_NFT_CHAIN_ROUTE_IPV4 is not set
-CONFIG_NFT_COMPAT=y
-# CONFIG_NFT_COUNTER is not set
-CONFIG_NFT_CT=y
-# CONFIG_NFT_EXTHDR is not set
-# CONFIG_NFT_HASH is not set
-# CONFIG_NFT_LIMIT is not set
-# CONFIG_NFT_LOG is not set
-CONFIG_NFT_MASQ=y
-# CONFIG_NFT_MASQ_IPV4 is not set
-# CONFIG_NFT_META is not set
-CONFIG_NFT_NAT=y
-# CONFIG_NFT_NUMGEN is not set
-# CONFIG_NFT_QUOTA is not set
-# CONFIG_NFT_REDIR is not set
-# CONFIG_NFT_REJECT is not set
-# CONFIG_NFT_REJECT_IPV4 is not set
-# CONFIG_NFT_SET_HASH is not set
-# CONFIG_NFT_SET_RBTREE is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_IPV6=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_RTCACHE is not set
-CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_DEFRAG_IPV6=y
-# CONFIG_NF_LOG_BRIDGE is not set
-CONFIG_NF_LOG_COMMON=y
-CONFIG_NF_LOG_IPV6=y
-CONFIG_NF_NAT=y
-CONFIG_NF_NAT_IPV4=y
-CONFIG_NF_NAT_IPV6=y
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
-CONFIG_NF_NAT_MASQUERADE_IPV6=y
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_REDIRECT is not set
-CONFIG_NF_REJECT_IPV6=y
-CONFIG_NF_TABLES=y
-# CONFIG_NF_TABLES_ARP is not set
-CONFIG_NF_TABLES_BRIDGE=y
-# CONFIG_NF_TABLES_INET is not set
-CONFIG_NF_TABLES_IPV4=y
-# CONFIG_NF_TABLES_IPV6 is not set
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
@@ -1046,7 +969,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
-CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_RD_XZ=y
@@ -1240,7 +1162,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC3_PCI=y
-# CONFIG_USB_EHCI_FSL is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_PCI=y