Skip to content

Commit 316fba9

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: (48 commits) linux-firmware: add rtl8723du-firmware rtw88: move usb part out of backport tree firewall: fix locking issue when running racing condition tools/dosfstools: fix PKG_SOURCE (coolsnowwolf#10620) kernel: bump to 5.4.227, 5.10.159, 5.15.83 (coolsnowwolf#10619) dnsmasq: drop mini_ttl option dnsmasq: add support for filter-AAAA/A dnsmasq: add logfacility file to jail mounts firewall: set default fullcone to high performance mode generic: fix linux 6.1 flowoffload support kernel: kmod-ipt-ulog: Remove package rockchip: fix opc-h68k tf boot fail on some cards dnsmasq: bump to v2.8.7 silicon: fix kernel target kernel: Refresh kernel 5.10 kernel: refresh linux 6.1 patches treewide: remove kernel 6.0 support sunxi: add kernel 5.10 support mac80211: backport ath11k in linux kernel 6.1 Update README.md ...
2 parents ad1e005 + 72d0e2b commit 316fba9

File tree

446 files changed

+14836
-20024
lines changed

Some content is hidden

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

446 files changed

+14836
-20024
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
134134
iKOOLCORE 硬酷R1 多网口小主机 - N5105/N6005 : Cube box, rest fun. 方寸之间，尽享乐趣
135135

136136
(商品介绍页面 - 硬酷科技（支持花呗）)：
137+
[优惠券链接](https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=2208215115814&activityId=85fbaf791c4b45e9aaf5ec8e3d1cb2a9)
137138
[下单链接](https://item.taobao.com/item.htm?ft=t&id=682987219699)
138139

139140
[![r1](doc/r1.jpg)](https://item.taobao.com/item.htm?ft=t&id=682025492099)

‎doc/r1.jpg

-52.5 KB
Loading

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .158
2-
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
1+
LINUX_VERSION-5.10 = .159
2+
LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .82
2-
LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65
1+
LINUX_VERSION-5.15 = .83
2+
LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .226
2-
LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44
1+
LINUX_VERSION-5.4 = .227
2+
LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593

‎include/kernel-6.0

-2
This file was deleted.

‎include/kernel-6.1

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
LINUX_VERSION-6.1 =
2+
LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb

‎include/netfilter.mk

-7
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@ $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_connt
230230
$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc))
231231

232232

233-
# ulog
234-
235-
$(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
236-
237-
238233
# nflog
239234

240235
$(eval $(call nf_add,IPT_NFLOG,CONFIG_NETFILTER_XT_TARGET_NFLOG, $(P_XT)xt_NFLOG))
@@ -321,7 +316,6 @@ $(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_SNAT, $(P_EBT)ebt_snat))
321316

322317
# watchers
323318
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_LOG, $(P_EBT)ebt_log))
324-
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_ULOG, $(P_EBT)ebt_ulog))
325319
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFLOG, $(P_EBT)ebt_nflog))
326320
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nfqueue))
327321

@@ -393,7 +387,6 @@ IPT_BUILTIN += $(IPT_NAT6-y)
393387
IPT_BUILTIN += $(IPT_NAT_EXTRA-y)
394388
IPT_BUILTIN += $(NF_NATHELPER-y)
395389
IPT_BUILTIN += $(NF_NATHELPER_EXTRA-y)
396-
IPT_BUILTIN += $(IPT_ULOG-y)
397390
IPT_BUILTIN += $(IPT_TPROXY-y)
398391
IPT_BUILTIN += $(NFNETLINK-y)
399392
IPT_BUILTIN += $(NFNETLINK_LOG-y)

‎package/base-files/files/etc/init.d/boot

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ boot() {
4848

4949
/bin/config_generate
5050
uci_apply_defaults
51+
sync
5152

5253
# temporary hack until configd exists
5354
/sbin/reload_config

‎package/base-files/files/etc/init.d/system

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
START=10
55
USE_PROCD=1
66

7-
validate_system_section()
8-
{
7+
validate_system_section() {
98
uci_load_validate system system "$1" "$2" \
109
'hostname:string:OpenWrt' \
1110
'conloglevel:uinteger' \
@@ -23,8 +22,9 @@ system_config() {
2322
echo "$hostname" > /proc/sys/kernel/hostname
2423
[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
2524
echo "$timezone" > /tmp/TZ
26-
[ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && \
27-
ln -sf "/usr/share/zoneinfo/$zonename" /tmp/localtime && rm -f /tmp/TZ
25+
[ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/${zonename// /_}" ] \
26+
&& ln -sf "/usr/share/zoneinfo/${zonename// /_}" /tmp/localtime \
27+
&& rm -f /tmp/TZ
2828

2929
# apply timezone to kernel
3030
hwclock -u --systz
@@ -35,8 +35,7 @@ reload_service() {
3535
config_foreach validate_system_section system system_config
3636
}
3737

38-
service_triggers()
39-
{
38+
service_triggers() {
4039
procd_add_reload_trigger "system"
4140
procd_add_validation validate_system_section
4241
}

‎package/base-files/files/etc/profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[ -f /etc/banner ] && cat /etc/banner
44
[ -n "$FAILSAFE" ] && cat /etc/banner.failsafe
55

6-
fgrep -sq '/ overlay ro,' /proc/mounts && {
6+
grep -Fsq '/ overlay ro,' /proc/mounts && {
77
echo 'Your JFFS2-partition seems full and overlayfs is mounted read-only.'
88
echo 'Please try to remove files from /overlay/upper/... and reboot!'
99
}

‎package/base-files/files/etc/shadow

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
root::0:0:99999:7:::
1+
root:::0:99999:7:::
22
daemon:*:0:0:99999:7:::
33
ftp:*:0:0:99999:7:::
44
network:*:0:0:99999:7:::

‎package/base-files/files/lib/functions/uci-defaults.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ ucidef_set_interfaces_lan_wan() {
9696

9797
ucidef_set_bridge_device() {
9898
json_select_object bridge
99-
json_add_string name "${1:switch0}"
99+
json_add_string name "${1:-switch0}"
100100
json_select ..
101101
}
102102

‎package/base-files/files/sbin/wifi

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ wifi_updown() {
128128
[ enable = "$1" ] && {
129129
_wifi_updown disable "$2"
130130
ubus_wifi_cmd "$cmd" "$2"
131+
ubus call network reload
131132
scan_wifi
132133
cmd=up
133-
ubus call network reload
134134
}
135135
[ reconf = "$1" ] && {
136+
ubus call network reload
136137
scan_wifi
137138
cmd=reconf
138-
ubus call network reload
139139
}
140140
ubus_wifi_cmd "$cmd" "$2"
141141
_wifi_updown "$@"

‎package/boot/uboot-rockchip/Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -170,23 +170,23 @@ define U-Boot/opc-h68k-rk3568
170170
DDR:=rk3568_ddr_1560MHz_v1.13.bin
171171
endef
172172

173-
define U-Boot/rock-3a-rk3568
173+
define U-Boot/radxa-e25-rk3568
174174
BUILD_SUBTARGET:=armv8
175-
NAME:=ROCK3 Model A
175+
NAME:=Radxa E25
176176
BUILD_DEVICES:= \
177-
radxa_rock-3a
178-
DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
177+
radxa_e25
178+
DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:arm-trusted-firmware-rk3568
179179
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
180180
ATF:=rk3568_bl31_v1.28.elf
181181
DDR:=rk3568_ddr_1560MHz_v1.13.bin
182182
endef
183183

184-
define U-Boot/rock-pi-e25-rk3568
184+
define U-Boot/rock-3a-rk3568
185185
BUILD_SUBTARGET:=armv8
186-
NAME:=ROCK Pi E25
186+
NAME:=ROCK3 Model A
187187
BUILD_DEVICES:= \
188-
radxa_rock-pi-e25
189-
DEPENDS:=+PACKAGE_u-boot-rock-pi-e25-rk3568:arm-trusted-firmware-rk3568
188+
radxa_rock-3a
189+
DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
190190
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
191191
ATF:=rk3568_bl31_v1.28.elf
192192
DDR:=rk3568_ddr_1560MHz_v1.13.bin
@@ -218,8 +218,8 @@ endef
218218
UBOOT_TARGETS := \
219219
mrkaio-m68s-rk3568 \
220220
opc-h68k-rk3568 \
221+
radxa-e25-rk3568 \
221222
rock-3a-rk3568 \
222-
rock-pi-e25-rk3568 \
223223
r66s-rk3568 \
224224
station-p2-rk3568 \
225225
guangmiao-g4c-rk3399 \

‎package/boot/uboot-rockchip/patches/302-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch

+16-41
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
+#include "rk3328-nanopi-r2s-u-boot.dtsi"
1515
--- /dev/null
1616
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus.dts
17-
@@ -0,0 +1,38 @@
17+
@@ -0,0 +1,25 @@
1818
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1919
+#include "rk3328-nanopi-r2s.dts"
2020
+
@@ -23,86 +23,59 @@
2323
+ compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328";
2424
+};
2525
+
26-
+&lan_led {
27-
+ label = "orangepi-r1-plus:green:lan";
28-
+};
29-
+
3026
+&spi0 {
3127
+ status = "okay";
3228
+
3329
+ flash@0 {
3430
+ compatible = "jedec,spi-nor";
3531
+ reg = <0>;
36-
+ spi-max-frequency = <10000000>;
32+
+ spi-max-frequency = <50000000>;
3733
+ };
3834
+};
3935
+
4036
+&sys_led {
4137
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
42-
+ label = "orangepi-r1-plus:red:sys";
4338
+};
4439
+
4540
+&sys_led_pin {
4641
+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
4742
+};
48-
+
49-
+&uart1 {
50-
+ status = "okay";
51-
+};
52-
+
53-
+&wan_led {
54-
+ label = "orangepi-r1-plus:green:wan";
55-
+};
56-
--- a/board/rockchip/evb_rk3328/MAINTAINERS
57-
+++ b/board/rockchip/evb_rk3328/MAINTAINERS
58-
@@ -12,6 +12,13 @@ F: configs/nanopi-r2s-rk3328_defconfig
59-
F: arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
60-
F: arch/arm/dts/rk3328-nanopi-r2s.dts
61-
62-
+ORANGEPI-R1-PLUS-RK3328
63-
+M: Shenzhen Xunlong Software CO.,Limited <[email protected]>
64-
+S: Maintained
65-
+F: configs/orangepi-r1-plus-rk3328_defconfig
66-
+F: arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
67-
+F: arch/arm/dts/rk3328-orangepi-r1-plus.dts
68-
+
69-
ROC-RK3328-CC
70-
M: Loic Devulder <[email protected]>
71-
M: Chen-Yu Tsai <[email protected]>
7243
--- /dev/null
7344
+++ b/configs/orangepi-r1-plus-rk3328_defconfig
74-
@@ -0,0 +1,100 @@
45+
@@ -0,0 +1,104 @@
7546
+CONFIG_ARM=y
47+
+CONFIG_SKIP_LOWLEVEL_INIT=y
48+
+CONFIG_COUNTER_FREQUENCY=24000000
7649
+CONFIG_ARCH_ROCKCHIP=y
7750
+CONFIG_SYS_TEXT_BASE=0x00200000
78-
+CONFIG_SPL_GPIO_SUPPORT=y
51+
+CONFIG_SPL_GPIO=y
52+
+CONFIG_NR_DRAM_BANKS=1
7953
+CONFIG_ENV_OFFSET=0x3F8000
54+
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus"
8055
+CONFIG_ROCKCHIP_RK3328=y
8156
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
8257
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
8358
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
84-
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
59+
+CONFIG_SPL_DRIVERS_MISC=y
8560
+CONFIG_SPL_STACK_R_ADDR=0x600000
86-
+CONFIG_NR_DRAM_BANKS=1
87-
+CONFIG_SYS_LOAD_ADDR=0x800800
8861
+CONFIG_DEBUG_UART_BASE=0xFF130000
8962
+CONFIG_DEBUG_UART_CLOCK=24000000
90-
+CONFIG_SYSINFO=y
63+
+CONFIG_SYS_LOAD_ADDR=0x800800
9164
+CONFIG_DEBUG_UART=y
9265
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
9366
+# CONFIG_ANDROID_BOOT_IMAGE is not set
9467
+CONFIG_FIT=y
9568
+CONFIG_FIT_VERBOSE=y
9669
+CONFIG_SPL_LOAD_FIT=y
9770
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb"
98-
+CONFIG_MISC_INIT_R=y
9971
+# CONFIG_DISPLAY_CPUINFO is not set
10072
+CONFIG_DISPLAY_BOARDINFO_LATE=y
73+
+CONFIG_MISC_INIT_R=y
10174
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
10275
+CONFIG_TPL_SYS_MALLOC_SIMPLE=y
10376
+CONFIG_SPL_STACK_R=y
104-
+CONFIG_SPL_I2C_SUPPORT=y
105-
+CONFIG_SPL_POWER_SUPPORT=y
77+
+CONFIG_SPL_I2C=y
78+
+CONFIG_SPL_POWER=y
10679
+CONFIG_SPL_ATF=y
10780
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
10881
+CONFIG_CMD_BOOTZ=y
@@ -113,11 +86,11 @@
11386
+CONFIG_CMD_TIME=y
11487
+CONFIG_SPL_OF_CONTROL=y
11588
+CONFIG_TPL_OF_CONTROL=y
116-
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus"
11789
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
11890
+CONFIG_TPL_OF_PLATDATA=y
11991
+CONFIG_ENV_IS_IN_MMC=y
12092
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
93+
+CONFIG_SYS_MMC_ENV_DEV=1
12194
+CONFIG_NET_RANDOM_ETHADDR=y
12295
+CONFIG_TPL_DM=y
12396
+CONFIG_REGMAP=y
@@ -142,6 +115,7 @@
142115
+CONFIG_SPL_PINCTRL=y
143116
+CONFIG_DM_PMIC=y
144117
+CONFIG_PMIC_RK8XX=y
118+
+CONFIG_SPL_PMIC_RK8XX=y
145119
+CONFIG_SPL_DM_REGULATOR=y
146120
+CONFIG_REGULATOR_PWM=y
147121
+CONFIG_DM_REGULATOR_FIXED=y
@@ -154,6 +128,7 @@
154128
+CONFIG_DM_RESET=y
155129
+CONFIG_BAUDRATE=1500000
156130
+CONFIG_DEBUG_UART_SHIFT=2
131+
+CONFIG_SYSINFO=y
157132
+CONFIG_SYSRESET=y
158133
+# CONFIG_TPL_SYSRESET is not set
159134
+CONFIG_USB=y

0 commit comments

Comments
 (0)