Skip to content

Commit e016cfe

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: (26 commits) pacakge: add mosdns and luci-app-mosdns from sbwml kernel: bump 5.15 to 5.15.80 (coolsnowwolf#10506) kernel: bump 6.0 to 6.0.10 (coolsnowwolf#10505) kernel: bump 5.10 to 5.10.156 (coolsnowwolf#10498) kernel: bump 5.4 to 5.4.225 tools/mpfr: update to 4.1.1 (coolsnowwolf#10502) Update feeds.conf.default iwinfo: add hardware id for MT7922 devices support Revert "x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug" ipq807x: disable br-nf after qca-nss-ecm start (coolsnowwolf#10488) x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug rockchip: 5.15: add missing kernel config generic: 5.15: add missing PAGE_POOL_STATS config kernel: add CONFIG_NVMEM_U_BOOT_ENV symbol to configs ipq60xx: add 360_v6 ath11k wifi BDF ath11k-wifi: add board bdf files package kernel: sysctl: update nf_ct_expect settings for fullcone nat mode 2 Revert "dnsmasq: bump to v2.87" x86: add kmod-tg3 by default upx: fix hash (coolsnowwolf#10479) ...
2 parents 19ef8c3 + da4a9aa commit e016cfe

File tree

104 files changed

+2484
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2484
-174
lines changed

‎feeds.conf.default

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ src-git packages https://github.com/coolsnowwolf/packages
22
src-git luci https://github.com/coolsnowwolf/luci
33
src-git routing https://github.com/coolsnowwolf/routing
44
src-git telephony https://git.openwrt.org/feed/telephony.git
5-
src-git oui https://github.com/zhaojh329/oui.git
5+
#src-git helloworld https://github.com/fw876/helloworld.git
6+
#src-git oui https://github.com/zhaojh329/oui.git
67
#src-git video https://github.com/openwrt/video.git
78
#src-git targets https://github.com/openwrt/targets.git
89
#src-git oldpackages http://git.openwrt.org/packages.git

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .155
2-
LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3
1+
LINUX_VERSION-5.10 = .156
2+
LINUX_KERNEL_HASH-5.10.156 = 679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .79
2-
LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154
1+
LINUX_VERSION-5.15 = .80
2+
LINUX_KERNEL_HASH-5.15.80 = 3b321a6466d2021f60ed8d4e33bba21db2f23efc2ddd2d9fb775393d9afdfd4d

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .224
2-
LINUX_KERNEL_HASH-5.4.224 = 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36
1+
LINUX_VERSION-5.4 = .225
2+
LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa

‎include/kernel-6.0

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.0 = .9
2-
LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7
1+
LINUX_VERSION-6.0 = .10
2+
LINUX_KERNEL_HASH-6.0.10 = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0

‎package/firmware/ath11k-wifi/Makefile

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
include $(TOPDIR)/rules.mk
2+
include $(INCLUDE_DIR)/version.mk
3+
4+
PKG_NAME:=ath11k-wifi
5+
PKG_RELEASE:=1
6+
PKG_FLAGS:=nonshared
7+
8+
include $(INCLUDE_DIR)/package.mk
9+
10+
define Build/Prepare
11+
mkdir -p $(PKG_BUILD_DIR)
12+
endef
13+
14+
define Build/Compile
15+
endef
16+
17+
# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git
18+
# to generate the board-* files here.
19+
#
20+
# This is intended to be used on an interim basis until device-specific
21+
# board data for new devices is available through the upstream compilation
22+
#
23+
# Please send a mail with your device-specific board files upstream.
24+
# You can find instructions and examples on the linux-wireless wiki:
25+
# <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
26+
27+
ALLWIFIBOARDS:= \
28+
gl-ax1800 \
29+
gl-axt1800 \
30+
qihoo_v6
31+
32+
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
33+
34+
define Package/ath11k-wifi-default
35+
SUBMENU:=ath11k Board-Specific Overrides
36+
SECTION:=firmware
37+
CATEGORY:=Firmware
38+
DEPENDS:=@TARGET_ipq60xx
39+
TITLE:=Custom Board
40+
endef
41+
42+
define ath11k-wifi-install-one-to
43+
$(INSTALL_DIR) $(2)/lib/firmware/ath11k/$(3)/
44+
$(INSTALL_DATA) $(1) $(2)/lib/firmware/ath11k/$(3)/board-2.bin
45+
endef
46+
47+
define ath11k-wifi-install-one
48+
$(if $(filter $(suffix $(1)),.IPQ6018 .ipq6018),\
49+
$(call ath11k-wifi-install-one-to,$(1),$(2),IPQ6018/hw1.0),\
50+
$(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\
51+
)
52+
53+
endef
54+
# Blank line required at end of above define due to foreach context
55+
56+
define generate-ath11k-wifi-package
57+
define Package/ath11k-wifi-$(1)
58+
$(call Package/ath11k-wifi-default)
59+
TITLE:=board-2.bin Overrides for $(2)
60+
CONFLICTS:=$(PREV_BOARD)
61+
endef
62+
63+
define Package/ath11k-wifi-$(1)/description
64+
The $(2) requires board-specific, reference ("cal") data
65+
that is not yet present in the upstream wireless firmware distribution.
66+
67+
This package supplies board-2.bin file(s) that, in the interim,
68+
overwrite those supplied by the ath10k-firmware-* packages.
69+
70+
This is package is only necessary for the $(2).
71+
72+
Do not install it for any other device!
73+
endef
74+
75+
define Package/ath11k-wifi-$(1)/install-overlay
76+
$$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\
77+
$$$$(call ath11k-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1)))
78+
endef
79+
80+
PREV_BOARD+=ath11k-wifi-$(1)
81+
endef
82+
83+
# Add board name to ALLWIFIBOARDS
84+
# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
85+
# Add $(eval $(call generate-ath11k-wifi-package,<devicename>,<display name>))
86+
87+
$(eval $(call generate-ath11k-wifi-package,gl-ax1800,Gl.iNET AX1800))
88+
$(eval $(call generate-ath11k-wifi-package,gl-axt1800,Gl.iNET AXT1800))
89+
$(eval $(call generate-ath11k-wifi-package,qihoo_v6,QIHOO 360V6))
90+
91+
92+
$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))

‎package/firmware/ath11k-wifi/board-2.bin.IPQ6018

769 KB
Binary file not shown.

‎package/firmware/ath11k-wifi/board-gl-ax1800.bin.IPQ6018

769 KB
Binary file not shown.

‎package/firmware/ath11k-wifi/board-gl-axt1800.bin.IPQ6018

769 KB
Binary file not shown.

‎package/firmware/ath11k-wifi/board-qihoo_360v6.bin.IPQ6018

769 KB
Binary file not shown.

‎package/firmware/ath11k-wifi/qdss_trace_config.bin

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
//This comment and parser will ignore
2+
//Tracer scenario(or commands) always
3+
//starts with start keyword
4+
//Below commands to enable Event traces on UMAC,MAC0,MAC1
5+
//seq_start;
6+
//seq_type:mem_req;
7+
//memory size always given in KB. beow example reserves 3 buffers segments of 16 KB.
8+
//sink:etr_ddr,0x1,0x1000;
9+
//seq_end;
10+
//Below commands to enable Event traces on UMAC,MAC0,MAC1
11+
seq_start;
12+
seq_type:mac_event_trace;
13+
sink:etr_ddr;
14+
subsys_cfg_start:mac0;
15+
hwsch:0x1, 0x000FFFF1,0x1036052C,0x0,0x0;
16+
rxdma:0x2, 0x3400,0x8000,0x0,0x0;
17+
crypto:0x3, 0xF79B3770,0x0,0x0,0x0;
18+
txpcu:0x4, 0xD687F4E7,0x20000092,0x0,0x0;
19+
txole:0x5, 0x640F0622,0x2,0x0,0x0;
20+
pdg:0x6, 0x3C800706,0x0,0x0,0x0;
21+
subsys_cfg_end:mac0;
22+
subsys_cfg_start:mac1;
23+
hwsch:0x7, 0x000FFFF1,0x1036052C,0x0,0x0;
24+
rxdma:0x8, 0x3400,0x8000,0x0,0x0;
25+
crypto:0x9, 0xF79B3770,0x0,0x0,0x0;
26+
txpcu:0xA, 0xD687F4E7,0x20000092,0x0,0x0;
27+
txole:0xB, 0x640F0622,0x2,0x0,0x0;
28+
pdg:0xC, 0x3C800706,0x0,0x0,0x0;
29+
subsys_cfg_end:mac1;
30+
swap:0xFFFFFFFF;
31+
trigger_start:trc;
32+
wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
33+
ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
34+
ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
35+
ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
36+
ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
37+
ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
38+
trigger_end:trc;
39+
memw:0xFFFFFFFF,0xFFFFFFFF;
40+
seq_end;
41+
// Below commands to enable obo trace on the mac0
42+
//seq_start;
43+
//seq_type:mac_obo_trace;
44+
//sink:etb_wcss;
45+
//subsys_cfg_start:mac0;
46+
//hwsch:0x1,0xABCDABCD;
47+
//subsys_cfg_end:mac0;
48+
//swap:0xABCDABCD;
49+
//trigger_start:trc;
50+
//wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
51+
//ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
52+
//ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
53+
//ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
54+
//ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
55+
//ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
56+
//trigger_end:trc;
57+
//memw:0xFFFFFFFF,0xFFFFFFFF;
58+
//seq_end;
59+
// Below commands to enable TLV trace on the mac0
60+
//seq_start;
61+
//seq_type:mac_tlv_trace;
62+
//sink:etb_wcss;
63+
//subsys_cfg_start:mac0;
64+
//tlv_port:PDG_TXDMA_TLV;
65+
//subsys_cfg_end:mac0;
66+
//seq_end;
67+
// Below commands to enable q6 etm
68+
//seq_start;
69+
//seq_type:q6_etm_trace;
70+
//sink:etr_ddr;
71+
//seq_end;
72+
// Below commands to enable umac noc traces
73+
//seq_start;
74+
//seq_type:umac_noc_trace;
75+
//sink:etb_wcss;
76+
//ctrl:0x12;
77+
//port_sel:0x4;
78+
//lut:0xA;
79+
//routeid_base:0x01000000;
80+
//routeid_mask:0x01c00000;
81+
//addr_lo:0x0;
82+
//addr_hi:0x0;
83+
//win_size:0x25;
84+
//req_opcode:0x3;
85+
//res_status:0x3;
86+
//fltr_len:0xF;
87+
//async_period:0xC;
88+
//seq_end;
89+
// Below commands to enable umac noc traces
90+
//seq_start;
91+
//seq_type:phy_tlv_trace;
92+
//sink:etr_ddr;
93+
//seq_end;
94+
//seq_start;
95+
//seq_type:phy_event_trace;
96+
//sink:etr_ddr;
97+
//phya:0x1,0x1;
98+
//phyb:0x1,0x1;
99+
//seq_end;

‎package/kernel/linux/files/sysctl-nf-conntrack.conf

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ net.netfilter.nf_conntrack_max=65535
77
net.netfilter.nf_conntrack_tcp_timeout_established=7440
88
net.netfilter.nf_conntrack_udp_timeout=60
99
net.netfilter.nf_conntrack_udp_timeout_stream=180
10-
net.netfilter.nf_conntrack_helper=1
10+
net.netfilter.nf_conntrack_helper=1
11+
net.netfilter.nf_conntrack_buckets=16384
12+
net.netfilter.nf_conntrack_expect_max=16384

‎package/kernel/linux/modules/hwmon.mk

+15
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,21 @@ endef
427427
$(eval $(call KernelPackage,hwmon-sht21))
428428

429429

430+
define KernelPackage/hwmon-sht3x
431+
TITLE:=Sensiron SHT3x and compat. monitoring support
432+
KCONFIG:=CONFIG_SENSORS_SHT3x
433+
FILES:=$(LINUX_DIR)/drivers/hwmon/sht3x.ko
434+
AUTOLOAD:=$(call AutoProbe,sht3x)
435+
$(call AddDepends/hwmon,+kmod-i2c-core +kmod-lib-crc8)
436+
endef
437+
438+
define KernelPackage/hwmon-sht3x/description
439+
Kernel module for Sensirion SHT3x temperature and humidity sensors chip
440+
endef
441+
442+
$(eval $(call KernelPackage,hwmon-sht3x))
443+
444+
430445
define KernelPackage/hwmon-tmp102
431446
TITLE:=Texas Instruments TMP102 monitoring support
432447
KCONFIG:=CONFIG_SENSORS_TMP102

‎package/lean/luci-app-mosdns/Makefile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
include $(TOPDIR)/rules.mk
2+
3+
PKG_NAME:=luci-app-mosdns
4+
PKG_VERSION:=1.4.3
5+
PKG_RELEASE:=2
6+
7+
LUCI_TITLE:=LuCI Support for mosdns
8+
LUCI_PKGARCH:=all
9+
LUCI_DEPENDS:=+mosdns +jsonfilter +luci-compat +curl +v2ray-geoip +v2ray-geosite
10+
11+
define Package/$(PKG_NAME)/conffiles
12+
/etc/config/mosdns
13+
/etc/mosdns/config_custom.yaml
14+
/etc/mosdns/rule
15+
endef
16+
17+
include $(TOPDIR)/feeds/luci/luci.mk
18+
19+
# call BuildPackage - OpenWrt buildroot signature

‎package/lean/luci-app-mosdns/luasrc/controller/mosdns.lua

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module("luci.controller.mosdns", package.seeall)
2+
3+
function index()
4+
if not nixio.fs.access("/etc/config/mosdns") then
5+
return
6+
end
7+
8+
local page = entry({"admin", "services", "mosdns"}, alias("admin", "services", "mosdns", "basic"), _("MosDNS"), 30)
9+
page.dependent = true
10+
page.acl_depends = { "luci-app-mosdns" }
11+
12+
entry({"admin", "services", "mosdns", "basic"}, cbi("mosdns/basic"), _("Basic Setting"), 1).leaf = true
13+
entry({"admin", "services", "mosdns", "rule_list"}, cbi("mosdns/rule_list"), _("Rule List"), 2).leaf = true
14+
entry({"admin", "services", "mosdns", "update"}, cbi("mosdns/update"), _("Geodata Update"), 3).leaf = true
15+
entry({"admin", "services", "mosdns", "log"}, cbi("mosdns/log"), _("Logs"), 4).leaf = true
16+
entry({"admin", "services", "mosdns", "status"}, call("act_status")).leaf = true
17+
entry({"admin", "services", "mosdns", "get_log"}, call("get_log")).leaf = true
18+
entry({"admin", "services", "mosdns", "clear_log"}, call("clear_log")).leaf = true
19+
entry({"admin", "services", "mosdns", "geo_update"}, call("geo_update")).leaf = true
20+
end
21+
22+
function act_status()
23+
local e = {}
24+
e.running = luci.sys.call("pgrep -f mosdns >/dev/null") == 0
25+
luci.http.prepare_content("application/json")
26+
luci.http.write_json(e)
27+
end
28+
29+
function get_log()
30+
luci.http.write(luci.sys.exec("cat $(/usr/share/mosdns/mosdns.sh logfile)"))
31+
end
32+
33+
function clear_log()
34+
luci.sys.call("cat /dev/null > $(/usr/share/mosdns/mosdns.sh logfile)")
35+
end
36+
37+
function geo_update()
38+
local e = {}
39+
e.updating = luci.sys.call("/usr/share/mosdns/mosdns.sh geodata >/dev/null") == 0
40+
luci.http.prepare_content("application/json")
41+
luci.http.write_json(e)
42+
end

0 commit comments

Comments
 (0)