Skip to content

Commit 36f30a4

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: mac80211: fixes build on kernel 6.0 rockchip: add support for Radxa ROCK Pi E25 Revert "kernel: add support for rtl88x2bu driver" build: add support for python3.11 and higher (coolsnowwolf#10392)
2 parents b1f1a66 + f14fbd6 commit 36f30a4

17 files changed

+867
-146
lines changed

‎include/prereq-build.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,22 @@ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
157157
$(eval $(call CleanupPython2))
158158

159159
$(eval $(call SetupHostCommand,python,Please install Python >= 3.6, \
160+
python3.11 -V 2>&1 | grep 'Python 3', \
160161
python3.10 -V 2>&1 | grep 'Python 3', \
161162
python3.9 -V 2>&1 | grep 'Python 3', \
162163
python3.8 -V 2>&1 | grep 'Python 3', \
163164
python3.7 -V 2>&1 | grep 'Python 3', \
164165
python3.6 -V 2>&1 | grep 'Python 3', \
165-
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|10)\.?'))
166+
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
166167

167168
$(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \
169+
python3.11 -V 2>&1 | grep 'Python 3', \
168170
python3.10 -V 2>&1 | grep 'Python 3', \
169171
python3.9 -V 2>&1 | grep 'Python 3', \
170172
python3.8 -V 2>&1 | grep 'Python 3', \
171173
python3.7 -V 2>&1 | grep 'Python 3', \
172174
python3.6 -V 2>&1 | grep 'Python 3', \
173-
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|10)\.?'))
175+
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
174176

175177
$(eval $(call TestHostCommand,python3-distutils, \
176178
Please install the Python3 distutils module, \

‎package/boot/uboot-rockchip/Makefile

+12
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,17 @@ define U-Boot/rock-3a-rk3568
181181
DDR:=rk3568_ddr_1560MHz_v1.13.bin
182182
endef
183183

184+
define U-Boot/rock-pi-e25-rk3568
185+
BUILD_SUBTARGET:=armv8
186+
NAME:=ROCK Pi E25
187+
BUILD_DEVICES:= \
188+
radxa_rock-pi-e25
189+
DEPENDS:=+PACKAGE_u-boot-rock-pi-e25-rk3568:arm-trusted-firmware-rk3568
190+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
191+
ATF:=rk3568_bl31_v1.28.elf
192+
DDR:=rk3568_ddr_1560MHz_v1.13.bin
193+
endef
194+
184195
define U-Boot/r66s-rk3568
185196
BUILD_SUBTARGET:=armv8
186197
NAME:=R66S/R68S
@@ -208,6 +219,7 @@ UBOOT_TARGETS := \
208219
mrkaio-m68s-rk3568 \
209220
opc-h68k-rk3568 \
210221
rock-3a-rk3568 \
222+
rock-pi-e25-rk3568 \
211223
r66s-rk3568 \
212224
station-p2-rk3568 \
213225
guangmiao-g4c-rk3399 \

‎package/boot/uboot-rockchip/patches/311-rockchip-rk3568-Add-support-for-radxa_rock-pi-e25.patch

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
--- a/arch/arm/dts/Makefile
2+
+++ b/arch/arm/dts/Makefile
3+
@@ -174,7 +174,8 @@ rk3568-evb.dtb \
4+
rk3568-mrkaio-m68s.dtb \
5+
rk3568-nanopi-r5s.dtb \
6+
rk3566-quartz64-a.dtb \
7+
- rk3568-rock-3a.dtb
8+
+ rk3568-rock-3a.dtb \
9+
+ rk3568-rock-pi-e25.dtb
10+
11+
dtb-$(CONFIG_ROCKCHIP_RV1108) += \
12+
rv1108-elgin-r1.dtb \
13+
--- /dev/null
14+
+++ b/arch/arm/dts/rk3568-rock-pi-e25-u-boot.dtsi
15+
@@ -0,0 +1,21 @@
16+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
17+
+
18+
+#include "rk3568-u-boot.dtsi"
19+
+
20+
+/ {
21+
+ chosen {
22+
+ stdout-path = &uart2;
23+
+ u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci;
24+
+ };
25+
+};
26+
+
27+
+&sdmmc0 {
28+
+ bus-width = <4>;
29+
+ u-boot,spl-fifo-mode;
30+
+};
31+
+
32+
+&uart2 {
33+
+ u-boot,dm-spl;
34+
+ clock-frequency = <24000000>;
35+
+ status = "okay";
36+
+};
37+
--- /dev/null
38+
+++ b/arch/arm/dts/rk3568-rock-pi-e25.dts
39+
@@ -0,0 +1,8 @@
40+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
41+
+
42+
+#include "rk3568-evb.dts"
43+
+
44+
+/ {
45+
+ model = "Radxa ROCK Pi E25";
46+
+ compatible = "radxa,rockpi-e25", "rockchip,rk3568";
47+
+};
48+
--- /dev/null
49+
+++ b/configs/rock-pi-e25-rk3568_defconfig
50+
@@ -0,0 +1,98 @@
51+
+CONFIG_ARM=y
52+
+CONFIG_SKIP_LOWLEVEL_INIT=y
53+
+CONFIG_ARCH_ROCKCHIP=y
54+
+CONFIG_SYS_TEXT_BASE=0x00a00000
55+
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
56+
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
57+
+CONFIG_NR_DRAM_BANKS=2
58+
+CONFIG_DEFAULT_DEVICE_TREE="rk3568-rock-pi-e25"
59+
+CONFIG_ROCKCHIP_RK3568=y
60+
+CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
61+
+CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
62+
+CONFIG_SPL_MMC=y
63+
+CONFIG_SPL_SERIAL=y
64+
+CONFIG_SPL_STACK_R_ADDR=0x600000
65+
+CONFIG_TARGET_EVB_RK3568=y
66+
+CONFIG_DEBUG_UART_BASE=0xFE660000
67+
+CONFIG_DEBUG_UART_CLOCK=24000000
68+
+CONFIG_DEBUG_UART=y
69+
+CONFIG_SYS_LOAD_ADDR=0xc00800
70+
+CONFIG_API=y
71+
+CONFIG_FIT=y
72+
+CONFIG_FIT_VERBOSE=y
73+
+CONFIG_SPL_LOAD_FIT=y
74+
+CONFIG_OF_SYSTEM_SETUP=y
75+
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-pi-e25.dtb"
76+
+# CONFIG_SYS_DEVICE_NULLDEV is not set
77+
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
78+
+# CONFIG_DISPLAY_CPUINFO is not set
79+
+CONFIG_DISPLAY_BOARDINFO_LATE=y
80+
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
81+
+CONFIG_SPL_STACK_R=y
82+
+CONFIG_SPL_SEPARATE_BSS=y
83+
+CONFIG_SPL_ATF=y
84+
+CONFIG_SPL_ATF_LOAD_IMAGE_V2=y
85+
+CONFIG_CMD_BIND=y
86+
+CONFIG_CMD_CLK=y
87+
+CONFIG_CMD_GPIO=y
88+
+CONFIG_CMD_GPT=y
89+
+CONFIG_CMD_I2C=y
90+
+CONFIG_CMD_MMC=y
91+
+CONFIG_CMD_USB=y
92+
+# CONFIG_CMD_SETEXPR is not set
93+
+CONFIG_CMD_PMIC=y
94+
+CONFIG_CMD_REGULATOR=y
95+
+# CONFIG_SPL_DOS_PARTITION is not set
96+
+CONFIG_SPL_OF_CONTROL=y
97+
+CONFIG_OF_LIVE=y
98+
+CONFIG_NET_RANDOM_ETHADDR=y
99+
+CONFIG_SPL_DM_WARN=y
100+
+CONFIG_SPL_REGMAP=y
101+
+CONFIG_SPL_SYSCON=y
102+
+CONFIG_SPL_CLK=y
103+
+CONFIG_ROCKCHIP_GPIO=y
104+
+CONFIG_ROCKCHIP_GPIO_V2=y
105+
+CONFIG_SYS_I2C_ROCKCHIP=y
106+
+CONFIG_MISC=y
107+
+CONFIG_MMC_HS200_SUPPORT=y
108+
+CONFIG_SPL_MMC_HS200_SUPPORT=y
109+
+CONFIG_MMC_DW=y
110+
+CONFIG_MMC_DW_ROCKCHIP=y
111+
+CONFIG_MMC_SDHCI=y
112+
+CONFIG_MMC_SDHCI_SDMA=y
113+
+CONFIG_MMC_SDHCI_ROCKCHIP=y
114+
+CONFIG_DM_ETH=y
115+
+CONFIG_ETH_DESIGNWARE=y
116+
+CONFIG_GMAC_ROCKCHIP=y
117+
+CONFIG_POWER_DOMAIN=y
118+
+CONFIG_DM_PMIC=y
119+
+CONFIG_PMIC_RK8XX=y
120+
+CONFIG_SPL_PMIC_RK8XX=y
121+
+CONFIG_REGULATOR_PWM=y
122+
+CONFIG_DM_REGULATOR_FIXED=y
123+
+CONFIG_SPL_DM_REGULATOR_FIXED=y
124+
+CONFIG_DM_REGULATOR_GPIO=y
125+
+CONFIG_REGULATOR_RK8XX=y
126+
+CONFIG_PWM_ROCKCHIP=y
127+
+CONFIG_SPL_RAM=y
128+
+CONFIG_DM_RESET=y
129+
+CONFIG_BAUDRATE=1500000
130+
+CONFIG_DEBUG_UART_SHIFT=2
131+
+CONFIG_SYSRESET=y
132+
+CONFIG_SYSRESET_PSCI=y
133+
+CONFIG_USB=y
134+
+CONFIG_USB_XHCI_HCD=y
135+
+CONFIG_USB_XHCI_DWC3=y
136+
+CONFIG_USB_EHCI_HCD=y
137+
+CONFIG_USB_EHCI_GENERIC=y
138+
+CONFIG_USB_OHCI_HCD=y
139+
+CONFIG_USB_OHCI_GENERIC=y
140+
+CONFIG_USB_DWC3=y
141+
+CONFIG_USB_DWC3_GENERIC=y
142+
+CONFIG_ROCKCHIP_USB2_PHY=y
143+
+CONFIG_USB_KEYBOARD=y
144+
+CONFIG_USB_HOST_ETHER=y
145+
+CONFIG_USB_ETHER_LAN75XX=y
146+
+CONFIG_USB_ETHER_LAN78XX=y
147+
+CONFIG_USB_ETHER_SMSC95XX=y
148+
+CONFIG_ERRNO_STR=y

‎package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch

-14
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,6 @@
7474

7575
return brcmf_fil_iovar_data_set(ifp, "p2p_ifdel", addr, ETH_ALEN);
7676
}
77-
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
78-
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
79-
@@ -4164,7 +4164,11 @@ static int brcmf_sdio_bus_reset(struct d
80-
81-
/* reset the adapter */
82-
sdio_claim_host(sdiodev->func1);
83-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
84-
mmc_hw_reset(sdiodev->func1->card->host);
85-
+#else
86-
+ mmc_hw_reset(sdiodev->func1->card);
87-
+#endif
88-
sdio_release_host(sdiodev->func1);
89-
90-
brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);
9177
--- a/include/net/cfg80211.h
9278
+++ b/include/net/cfg80211.h
9379
@@ -5555,7 +5555,7 @@ struct wireless_dev {

‎package/kernel/mac80211/patches/subsys/250-drivers-make-clear-mmc_hw_reset-is-for-cards.patch

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
--- a/drivers/net/wireless/ath/ath10k/sdio.c
2+
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
3+
@@ -1633,7 +1633,11 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar)
4+
return;
5+
}
6+
7+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
8+
ret = mmc_hw_reset(ar_sdio->func->card->host);
9+
+#else
10+
+ ret = mmc_hw_reset(ar_sdio->func->card);
11+
+#endif
12+
if (ret)
13+
ath10k_warn(ar, "unable to reset sdio: %d\n", ret);
14+
15+
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
16+
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
17+
@@ -4164,7 +4164,11 @@ static int brcmf_sdio_bus_reset(struct device *dev)
18+
19+
/* reset the adapter */
20+
sdio_claim_host(sdiodev->func1);
21+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
22+
mmc_hw_reset(sdiodev->func1->card->host);
23+
+#else
24+
+ mmc_hw_reset(sdiodev->func1->card);
25+
+#endif
26+
sdio_release_host(sdiodev->func1);
27+
28+
brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);
29+
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
30+
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
31+
@@ -2643,7 +2643,11 @@ static void mwifiex_sdio_card_reset_work(struct mwifiex_adapter *adapter)
32+
33+
/* Run a HW reset of the SDIO interface. */
34+
sdio_claim_host(func);
35+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
36+
ret = mmc_hw_reset(func->card->host);
37+
+#else
38+
+ ret = mmc_hw_reset(func->card);
39+
+#endif
40+
sdio_release_host(func);
41+
42+
switch (ret) {
43+
--- a/drivers/net/wireless/ti/wlcore/sdio.c
44+
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
45+
@@ -146,7 +146,11 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue)
46+
* To guarantee that the SDIO card is power cycled, as required to make
47+
* the FW programming to succeed, let's do a brute force HW reset.
48+
*/
49+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
50+
mmc_hw_reset(card->host);
51+
+#else
52+
+ mmc_hw_reset(card);
53+
+#endif
54+
55+
sdio_enable_func(func);
56+
sdio_release_host(func);

‎package/kernel/mac80211/patches/subsys/800-ethtool_ringparam.patch ‎package/kernel/mac80211/patches/subsys/784-ethtool_ringparam.patch

File renamed without changes.

‎package/kernel/mac80211/patches/subsys/800-backport-of_get_mac_address.patch ‎package/kernel/mac80211/patches/subsys/785-backport-of_get_mac_address.patch

File renamed without changes.

‎package/kernel/rtl88x2bu/Makefile

-53
This file was deleted.

‎package/kernel/rtl88x2bu/patches/001-use-kernel-byteorder.patch

-15
This file was deleted.

‎package/kernel/rtl88x2bu/patches/002-use-kernel-wireless-header.patch

-31
This file was deleted.

‎target/linux/rockchip/armv8/base-files/etc/board.d/01_leds

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ sharevdi,guangmiao-g4c)
2222
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
2323
ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
2424
;;
25-
firefly,rk3568-roc-pc)
26-
ucidef_set_led_timer "health" "health" "firefly:yellow:user" "200" "800"
27-
;;
2825
friendlyarm,nanopi-r5s)
2926
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
3027
ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth1"

‎target/linux/rockchip/armv8/base-files/etc/board.d/02_network

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ rockchip_setup_interfaces()
2222
ucidef_set_interfaces_lan_wan 'eth1 eth2 eth3' 'eth0'
2323
;;
2424
fastrhino,r66s|\
25-
firefly,rk3568-roc-pc)
25+
firefly,rk3568-roc-pc|\
26+
radxa,rockpi-e25)
2627
ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
2728
;;
2829
fastrhino,r68s)

0 commit comments

Comments
 (0)