[][MAC80211][misc][update mt76 Makefile patch]
[Description]
Add testmode firmwares into Makefile patch and remove the splitted patch
file.
[Release-log]
N/A
Change-Id: I25d8fed6f6e33b4fea536aac7b954ef9f011456e
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7519525
diff --git a/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch b/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
index adba145..c6abe1d 100644
--- a/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
+++ b/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
-index 04db7fe..8799c4a 100644
+index 04db7fe..b46f164 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -233,7 +233,7 @@ endef
@@ -86,7 +86,7 @@
$(1)/lib/firmware/mediatek
endef
-@@ -522,9 +542,31 @@ define KernelPackage/mt7986-firmware/install
+@@ -522,9 +542,33 @@ define KernelPackage/mt7986-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7986_rom_patch.bin \
$(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975_dual.bin \
$(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976_dual.bin \
@@ -108,9 +108,11 @@
+ cp \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_tm.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_dsp.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom_tm.bin \
+ $(1)/lib/firmware/mediatek/mt7996
+endef
+endif
@@ -118,7 +120,7 @@
define KernelPackage/mt7921-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \
-@@ -570,5 +612,6 @@ $(eval $(call KernelPackage,mt7921-common))
+@@ -570,5 +614,6 @@ $(eval $(call KernelPackage,mt7921-common))
$(eval $(call KernelPackage,mt7921u))
$(eval $(call KernelPackage,mt7921s))
$(eval $(call KernelPackage,mt7921e))
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211/0003-mt76-mt7996-copy-dsp-and-testmode-firmware.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211/0003-mt76-mt7996-copy-dsp-and-testmode-firmware.patch
deleted file mode 100644
index cae8df4..0000000
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211/0003-mt76-mt7996-copy-dsp-and-testmode-firmware.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8ae778a22a8749c06d8873a383d024177240e2d8 Mon Sep 17 00:00:00 2001
-From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Date: Wed, 1 Mar 2023 16:14:11 +0800
-Subject: [PATCH] mt76: mt7996 copy dsp and testmode firmware
-
-Change-Id: I14f555f2ba3ea27d18022613208e106568979963
-Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
----
- package/kernel/mt76/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index f572a109..50e42892 100644
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -545,8 +545,11 @@ define KernelPackage/mt7996e/install
- cp \
- $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa.bin \
- $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_tm.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_dsp.bin \
- $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch.bin \
- $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom_tm.bin \
- $(1)/lib/firmware/mediatek/mt7996
- endef
- endif
---
-2.18.0
-
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211/lede-branch-build-sanity.sh b/autobuild_mac80211_release/mt7988_mt7996_mac80211/lede-branch-build-sanity.sh
index d0f10fa..9e8397f 100755
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211/lede-branch-build-sanity.sh
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211/lede-branch-build-sanity.sh
@@ -54,8 +54,6 @@
# ========== specific modification on mt7996 autobuild for EHT support ==========
# patch hostapd to use latest version and add 11BE config
patch -p1 < ${BUILD_DIR}/autobuild/${branch_name}/0002-add-EHT-config-for-hostapd.patch
-# copy DSP & testmode firmware
-patch -p1 < ${BUILD_DIR}/autobuild/${branch_name}/0003-mt76-mt7996-copy-dsp-and-testmode-firmware.patch
# remove some iw patches to let EHT work normally
rm -rf ${BUILD_DIR}/package/network/utils/iw/patches/001-nl80211_h_sync.patch