update

devices/common/diy.sh

@@ -48,10 +48,10 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linu
 sed -i "s/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 ) &
 
-grep -q "2023-" package/kernel/mt76/Makefile && {
+grep -q "23.05" include/version.mk && {
 mkdir package/kernel/mt76/patches
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
-}
+} || rm -rf devices/common/patches/mt7922.patch
 
 grep -q "1.8.8" package/network/utils/iptables/Makefile && {
 rm -rf package/network/utils/iptables

devices/ipq50xx_arm/settings.ini

@@ -1,2 +1,2 @@
 REPO_URL="https://github.com/hzyitc/openwrt-redmi-ax3000"
-REPO_BRANCH=""
+REPO_BRANCH="ipq50xx-qsdk-kernel-5.4-openwrt-21.02-qsdk-11.5.05.841.1029"

devices/x86_64/patches/mt7922.patch

@@ -1,38 +0,0 @@
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -243,6 +243,12 @@ define KernelPackage/mt7921-firmware
-   TITLE:=MediaTek MT7921 firmware
- endef
- 
-+define KernelPackage/mt7922-firmware
-+  $(KernelPackage/mt76-default)
-+  DEPENDS+=+kmod-mt7921-common
-+  TITLE:=MediaTek MT7922 firmware
-+endef
-+
- define KernelPackage/mt7921-common
-   $(KernelPackage/mt76-default)
-   TITLE:=MediaTek MT7615 wireless driver common code
-@@ -501,6 +507,14 @@ define KernelPackage/mt7921-firmware/install
- 		$(1)/lib/firmware/mediatek
- endef
- 
-+define KernelPackage/mt7922-firmware/install
-+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
-+	cp \
-+		$(PKG_BUILD_DIR)/firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
-+		$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7922_1.bin \
-+		$(1)/lib/firmware/mediatek
-+endef
-+
- define Package/mt76-test/install
- 	mkdir -p $(1)/usr/sbin
- 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
-@@ -531,6 +545,7 @@ $(eval $(call KernelPackage,mt7915e))
- $(eval $(call KernelPackage,mt7916-firmware))
- $(eval $(call KernelPackage,mt7986-firmware))
- $(eval $(call KernelPackage,mt7921-firmware))
-+$(eval $(call KernelPackage,mt7922-firmware))
- $(eval $(call KernelPackage,mt7921-common))
- $(eval $(call KernelPackage,mt7921u))
- $(eval $(call KernelPackage,mt7921s))

devices/x86_generic/patches/mt7922.patch

@@ -1,38 +0,0 @@
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -243,6 +243,12 @@ define KernelPackage/mt7921-firmware
-   TITLE:=MediaTek MT7921 firmware
- endef
- 
-+define KernelPackage/mt7922-firmware
-+  $(KernelPackage/mt76-default)
-+  DEPENDS+=+kmod-mt7921-common
-+  TITLE:=MediaTek MT7922 firmware
-+endef
-+
- define KernelPackage/mt7921-common
-   $(KernelPackage/mt76-default)
-   TITLE:=MediaTek MT7615 wireless driver common code
-@@ -501,6 +507,14 @@ define KernelPackage/mt7921-firmware/install
- 		$(1)/lib/firmware/mediatek
- endef
- 
-+define KernelPackage/mt7922-firmware/install
-+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
-+	cp \
-+		$(PKG_BUILD_DIR)/firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
-+		$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7922_1.bin \
-+		$(1)/lib/firmware/mediatek
-+endef
-+
- define Package/mt76-test/install
- 	mkdir -p $(1)/usr/sbin
- 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
-@@ -531,6 +545,7 @@ $(eval $(call KernelPackage,mt7915e))
- $(eval $(call KernelPackage,mt7916-firmware))
- $(eval $(call KernelPackage,mt7986-firmware))
- $(eval $(call KernelPackage,mt7921-firmware))
-+$(eval $(call KernelPackage,mt7922-firmware))
- $(eval $(call KernelPackage,mt7921-common))
- $(eval $(call KernelPackage,mt7921u))
- $(eval $(call KernelPackage,mt7921s))