From d6b5af43ac0fbaadd35e5ede98b9314b3e510a4b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 26 Dec 2021 13:53:50 +0100
Subject: [PATCH] Fix support of some platforms

---
 config                                | 2 ++
 config-r7800                          | 1 +
 root/include/netfilter.mk             | 7 ++++---
 root/target/linux/generic/config-5.15 | 4 ++--
 root/target/linux/generic/config-5.4  | 4 ++--
 root/target/linux/mvebu/config-5.15   | 1 +
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/config b/config
index dec46f23..4b3a742a 100644
--- a/config
+++ b/config
@@ -256,3 +256,5 @@ CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
 CONFIG_KERNEL_DEVMEM=y
 CONFIG_KERNEL_DEVKMEM=y
 CONFIG_AUTOREMOVE=y
+# CONFIG_PACKAGE_kmod-sound-core is not set
+# CONFIG_PACKAGE_kmod-video-core is not set
\ No newline at end of file
diff --git a/config-r7800 b/config-r7800
index bfb3ca43..96180001 100644
--- a/config-r7800
+++ b/config-r7800
@@ -1,5 +1,6 @@
 CONFIG_TARGET_ipq806x=y
 CONFIG_TARGET_ipq806x_generic=y
+CONFIG_TARGET_ipq806x_generic_DEVICE_netgear_r7800=y
 CONFIG_PACKAGE_kmod-6lowpan=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y
 CONFIG_KERNEL_TCP_CONG_BBR2=y
diff --git a/root/include/netfilter.mk b/root/include/netfilter.mk
index 996d3d1d..2da459f3 100644
--- a/root/include/netfilter.mk
+++ b/root/include/netfilter.mk
@@ -48,8 +48,9 @@ $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comme
 $(eval $(call nf_add,IPT_CLUSTER,CONFIG_NETFILTER_XT_MATCH_CLUSTER, $(P_XT)xt_cluster))
 
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG))
-#$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)nf_log_common))
-#$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_V4)nf_log_ipv4))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)nf_log_common, lt 5.13))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_V4)nf_log_ipv4, lt 5.13))
+$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)nf_log_syslog, ge 5.13))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS))
 $(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT))
 $(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_TIME, $(P_XT)xt_time))
@@ -156,7 +157,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV6, $(P_V6)
 
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),))
-#$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6),lt 5.13))
 
 $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6)))
 
diff --git a/root/target/linux/generic/config-5.15 b/root/target/linux/generic/config-5.15
index b1d3024e..38fb2aca 100644
--- a/root/target/linux/generic/config-5.15
+++ b/root/target/linux/generic/config-5.15
@@ -339,7 +339,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_ERRATUM_858921 is not set
 # CONFIG_ARM64_HW_AFDBM is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
-# CONFIG_ARM64_MODULE_PLTS is not set
+CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_MTE is not set
 # CONFIG_ARM64_PAN is not set
 # CONFIG_ARM64_PMEM is not set
@@ -403,7 +403,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_MHU is not set
 # CONFIG_ARM_MHU_V2 is not set
-# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_ARM_MODULE_PLTS=y
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_ARM_PSCI_CHECKER is not set
diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4
index 8467933c..9b30cd74 100644
--- a/root/target/linux/generic/config-5.4
+++ b/root/target/linux/generic/config-5.4
@@ -311,7 +311,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_ERRATUM_1542419 is not set
 # CONFIG_ARM64_HW_AFDBM is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
-# CONFIG_ARM64_MODULE_PLTS is not set
+CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_PAN is not set
 # CONFIG_ARM64_PMEM is not set
 # CONFIG_ARM64_PSEUDO_NMI is not set
@@ -368,7 +368,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_MHU is not set
-# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_ARM_MODULE_PLTS=y
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_ARM_PSCI_CHECKER is not set
diff --git a/root/target/linux/mvebu/config-5.15 b/root/target/linux/mvebu/config-5.15
index bde2b765..b297a695 100644
--- a/root/target/linux/mvebu/config-5.15
+++ b/root/target/linux/mvebu/config-5.15
@@ -42,6 +42,7 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_MVEBU_V7_CPUIDLE=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARM_MODULE_PLTS=y
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y