Skip to content

Commit fdbf1b3

Browse files
igorpecovnikyury-deltsov
authored andcommitted
Wireless driver patching: fix inconsistency in matching (armbian#8789)
* Wireless driver patching: fix inconsistency in matching Mathing Allwinner family via LINUXFAMILY is giving different results. sunxi doesn't cover sun5* ... * Re-adding wireless drivers that fall out of this bug + few additional
1 parent 04b7850 commit fdbf1b3

File tree

2 files changed

+55
-6
lines changed

2 files changed

+55
-6
lines changed

config/kernel/linux-sunxi64-edge.config

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,6 @@ CONFIG_UEVENT_HELPER=y
596596
CONFIG_DEVTMPFS=y
597597
CONFIG_DEVTMPFS_MOUNT=y
598598
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
599-
CONFIG_MHI_BUS=m
600599
CONFIG_MHI_BUS_EP=m
601600
CONFIG_CONNECTOR=y
602601
CONFIG_ARM_SCMI_PROTOCOL=m
@@ -837,6 +836,7 @@ CONFIG_USB_IPHETH=m
837836
CONFIG_USB_SIERRA_NET=m
838837
CONFIG_USB_VL600=m
839838
CONFIG_USB_NET_CH9200=m
839+
CONFIG_USB_NET_AQC111=m
840840
CONFIG_ATH9K=m
841841
CONFIG_ATH9K_HTC=m
842842
CONFIG_ATH9K_HWRNG=y
@@ -845,6 +845,8 @@ CONFIG_CARL9170_HWRNG=y
845845
CONFIG_AR5523=m
846846
CONFIG_ATH10K=m
847847
CONFIG_ATH10K_USB=m
848+
CONFIG_ATH11K=m
849+
CONFIG_ATH11K_PCI=m
848850
CONFIG_ATH12K=m
849851
# CONFIG_WLAN_VENDOR_ATMEL is not set
850852
CONFIG_B43=m
@@ -857,10 +859,20 @@ CONFIG_BRCMFMAC=m
857859
# CONFIG_WLAN_VENDOR_MARVELL is not set
858860
CONFIG_MT7601U=m
859861
CONFIG_MT76x0U=m
862+
CONFIG_MT76x0E=m
863+
CONFIG_MT76x2E=m
860864
CONFIG_MT76x2U=m
865+
CONFIG_MT7603E=m
866+
CONFIG_MT7615E=m
861867
CONFIG_MT7663U=m
868+
CONFIG_MT7663S=m
869+
CONFIG_MT7915E=m
870+
CONFIG_MT7921E=m
862871
CONFIG_MT7921S=m
863872
CONFIG_MT7921U=m
873+
CONFIG_MT7996E=m
874+
CONFIG_MT7925E=m
875+
CONFIG_MT7925U=m
864876
CONFIG_PLFXLC=m
865877
CONFIG_RT2X00=m
866878
CONFIG_RT2500USB=m
@@ -870,30 +882,67 @@ CONFIG_RT2800USB_RT3573=y
870882
CONFIG_RT2800USB_RT53XX=y
871883
CONFIG_RT2800USB_RT55XX=y
872884
CONFIG_RTL8187=m
885+
CONFIG_RTL8192CE=m
886+
CONFIG_RTL8192SE=m
887+
CONFIG_RTL8192DE=m
888+
CONFIG_RTL8723AE=m
889+
CONFIG_RTL8723BE=m
890+
CONFIG_RTL8188EE=m
891+
CONFIG_RTL8192EE=m
892+
CONFIG_RTL8821AE=m
873893
CONFIG_RTL8192CU=m
894+
CONFIG_RTL8192DU=m
874895
# CONFIG_RTLWIFI_DEBUG is not set
875896
CONFIG_RTL8XXXU=m
897+
CONFIG_RTL8XXXU_UNTESTED=y
876898
CONFIG_RTW88=m
877899
CONFIG_RTW88_8822BS=m
878900
CONFIG_RTW88_8822BU=m
901+
CONFIG_RTW88_8822CE=m
879902
CONFIG_RTW88_8822CS=m
880903
CONFIG_RTW88_8822CU=m
904+
CONFIG_RTW88_8723DE=m
881905
CONFIG_RTW88_8723DS=m
882906
CONFIG_RTW88_8723CS=m
883907
CONFIG_RTW88_8723DU=m
908+
CONFIG_RTW88_8821CE=m
884909
CONFIG_RTW88_8821CS=m
885910
CONFIG_RTW88_8821CU=m
911+
CONFIG_RTW88_8821AU=m
912+
CONFIG_RTW88_8812AU=m
913+
CONFIG_RTW88_8814AE=m
914+
CONFIG_RTW88_8814AU=m
886915
CONFIG_RTW88_DEBUGFS=y
916+
CONFIG_RTW89=m
917+
CONFIG_RTW89_8851BE=m
918+
CONFIG_RTW89_8852AE=m
919+
CONFIG_RTW89_8852BE=m
920+
CONFIG_RTW89_8852BTE=m
921+
CONFIG_RTW89_8852CE=m
922+
CONFIG_RTW89_8922AE=m
887923
# CONFIG_WLAN_VENDOR_RSI is not set
888924
CONFIG_WFX=m
889925
# CONFIG_WLAN_VENDOR_ST is not set
890926
# CONFIG_WLAN_VENDOR_TI is not set
927+
CONFIG_RTL8723DS=m
928+
CONFIG_RTL8822BU=m
891929
CONFIG_RTL8821CU=m
930+
CONFIG_XRADIO=m
892931
CONFIG_88XXAU=m
893932
CONFIG_RTL8192EU=m
894933
CONFIG_RTL8189FS=m
895934
CONFIG_RTL8189ES=m
896935
# CONFIG_WLAN_VENDOR_ZYDAS is not set
936+
CONFIG_SPARD_WLAN_SUPPORT=y
937+
CONFIG_SC23XX=y
938+
CONFIG_UMW2653=m
939+
CONFIG_SC2342_INTEG=m
940+
CONFIG_SC2355=m
941+
CONFIG_SC2366=m
942+
CONFIG_WCN_BSP_DRIVER_BUILDIN=y
943+
CONFIG_WLAN_UWE5621=m
944+
CONFIG_WLAN_UWE5622=m
945+
CONFIG_UNISOC_WIFI_PS=y
897946
CONFIG_VIRT_WIFI=m
898947
CONFIG_WWAN=m
899948
CONFIG_WWAN_HWSIM=m

lib/functions/compilation/patch/drivers_network.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ driver_xradio_xr819() {
233233

234234
# Wireless drivers for Xradio XR819 chipsets
235235

236-
if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sunxi* ]]; then
236+
if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sun* ]]; then
237237

238238
# Attach to specific commit (is branch:master)
239239
local xradio_xr819_ver="commit:684a91a3692a964c5886dcf4369874cc7c19c0a4" # Commit date: Aug 7, 2025 (please update when updating commit ref)
@@ -482,7 +482,7 @@ driver_uwe5622() {
482482

483483
# Wireless drivers for Unisoc uwe5622 wireless
484484

485-
if linux-version compare "${version}" ge 5.15 && [[ "$LINUXFAMILY" == sunxi* || "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == rk35xx ]]; then
485+
if linux-version compare "${version}" ge 5.15 && [[ "$LINUXFAMILY" == sun* || "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == rk35xx ]]; then
486486

487487
display_alert "Adding" "Drivers for Unisoc uwe5622 found on some Allwinner and Rockchip boards" "info"
488488

@@ -522,7 +522,7 @@ driver_uwe5622() {
522522
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.6-fix-tty-sdio.patch" "applying"
523523
fi
524524

525-
if [[ "$LINUXFAMILY" == sunxi* ]]; then
525+
if [[ "$LINUXFAMILY" == sun* ]]; then
526526
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-fix-setting-mac-address-for-netdev.patch" "applying"
527527
fi
528528

@@ -552,7 +552,7 @@ driver_uwe5622() {
552552
fi
553553

554554
if linux-version compare "${version}" ge 6.15; then
555-
if [[ "$LINUXFAMILY" == sunxi* ]]; then
555+
if [[ "$LINUXFAMILY" == sun* ]]; then
556556
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-fix-timer-api-changes-for-6.15-only-sunxi.patch" "applying"
557557
else
558558
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.15-timer-api-changes.patch" "applying"
@@ -573,7 +573,7 @@ driver_uwe5622() {
573573
driver_rtl8723cs() {
574574

575575
# Wireless drivers for Realtek rtl8723cs chipsets
576-
# Driver has been borrowed from sunxi 6.1 megous patch archive.
576+
# Driver has been borrowed from sun* 6.1 megous patch archive.
577577
# Applies only from linux 6.1 onwards, so older kernel archives does not require to be altered
578578

579579
# It was disabled from d1/bcm2711 as that kernel is not fully in sync with mainline and as its probably not needed there anyway

0 commit comments

Comments
 (0)