mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Merge branch 'test' into develop
This commit is contained in:
commit
0debb4036e
6 changed files with 20 additions and 8219 deletions
3
config
3
config
|
@ -225,7 +225,8 @@ CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
|
|||
CONFIG_KERNEL_DEVMEM=y
|
||||
CONFIG_KERNEL_DEVKMEM=y
|
||||
CONFIG_AUTOREMOVE=y
|
||||
CONFIG_AUTOREMOVE=y
|
||||
# CONFIG_PACKAGE_kmod-sound-core is not set
|
||||
# CONFIG_PACKAGE_kmod-video-core is not set
|
||||
CONFIG_PACKAGE_luci-theme-argon=y
|
||||
CONFIG_PACKAGE_luci-theme-bootstrap=y
|
||||
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
|
||||
|
|
8220
config-r7800
Executable file → Normal file
8220
config-r7800
Executable file → Normal file
File diff suppressed because it is too large
Load diff
|
@ -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)))
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue