[][MAC80211][mt76][Update mt7986 wmac config]
[Description]
Fix mt7986 wmac config
[Release-log]
N/A
Change-Id: I3cec32b037e89343939e953d0e825d93354d2274
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6443286
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 9166c81..513e9c4 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,17 +1,17 @@
-From bd0dae19286bf13e74698d753a98e46b155a5882 Mon Sep 17 00:00:00 2001
+From c10a255caf19008afd1394c645759c40f83d52e0 Mon Sep 17 00:00:00 2001
From: Evelyn Tsai <evelyn.tsai@mediatek.com>
-Date: Wed, 30 Mar 2022 10:38:24 +0800
-Subject: [PATCH] mt76: add MT7986/MT7916/Besra support in makefile
+Date: Tue, 30 Aug 2022 10:45:21 +0800
+Subject: [PATCH] rrr
---
- kernel/mt76/Makefile | 69 +++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 68 insertions(+), 1 deletion(-)
+ package/kernel/mt76/Makefile | 52 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 49 insertions(+), 3 deletions(-)
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index 0ccf067..75e65f7 100644
+index ff58d27..8098cbf 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
-@@ -220,12 +220,20 @@ endef
+@@ -220,7 +220,7 @@ endef
define KernelPackage/mt7915e
$(KernelPackage/mt76-default)
@@ -20,6 +20,13 @@
DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
AUTOLOAD:=$(call AutoProbe,mt7915e)
+@@ -228,10 +228,18 @@ endef
+
+ define KernelPackage/mt7986-firmware
+ $(KernelPackage/mt76-default)
+- DEPENDS:=@TARGET_mediatek_filogic
++ DEPENDS:=+@TARGET_mediatek_mt7986
+ TITLE:=MediaTek MT7986 firmware
endef
+define KernelPackage/besra
@@ -33,7 +40,7 @@
define KernelPackage/mt7921-common
$(KernelPackage/mt76-default)
TITLE:=MediaTek MT7615 wireless driver common code
-@@ -281,6 +289,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
+@@ -287,6 +295,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
endif
@@ -45,56 +52,48 @@
ifdef CONFIG_PACKAGE_CFG80211_TESTMODE
NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE
PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y
-@@ -343,6 +356,13 @@ ifdef CONFIG_PACKAGE_kmod-mt7663u
+@@ -349,11 +362,14 @@ ifdef CONFIG_PACKAGE_kmod-mt7663u
endif
ifdef CONFIG_PACKAGE_kmod-mt7915e
PKG_MAKE_FLAGS += CONFIG_MT7915E=m
-+ifdef CONFIG_TARGET_mediatek_mt7986
-+ PKG_MAKE_FLAGS += CONFIG_MT7986_WMAC=y
-+ NOSTDINC_FLAGS += -DCONFIG_MT7986_WMAC
-+endif
-+endif
+- ifdef CONFIG_TARGET_mediatek_filogic
++ ifdef CONFIG_TARGET_mediatek_mt7986
+ PKG_MAKE_FLAGS += CONFIG_MT7986_WMAC=y
+ NOSTDINC_FLAGS += -DCONFIG_MT7986_WMAC
+ endif
+ endif
+ifdef CONFIG_PACKAGE_kmod-besra
+ PKG_MAKE_FLAGS += CONFIG_BESRA=m
- endif
++endif
ifdef CONFIG_PACKAGE_kmod-mt7921-common
PKG_MAKE_FLAGS += CONFIG_MT7921_COMMON=m
-@@ -447,9 +467,55 @@ define KernelPackage/mt7915e/install
+ endif
+@@ -457,6 +473,12 @@ define KernelPackage/mt7915e/install
$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7916_wa.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7916_wm.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7916_rom_patch.bin \
-+ $(1)/lib/firmware/mediatek
-+ifdef CONFIG_TARGET_mediatek_mt7986
-+ cp \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_wa.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_wm.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_wm_mt7975.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_rom_patch.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_rom_patch_mt7975.bin \
-+ $(1)/lib/firmware/mediatek
-+endif
-+ cp \
+ $(PKG_BUILD_DIR)/firmware/mt7916_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7915_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7915_eeprom_dbdc.bin \
$(1)/lib/firmware/mediatek
-+ifdef CONFIG_TARGET_mediatek_mt7986
-+ cp \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976_dual.bin \
+ endef
+
+@@ -470,9 +492,32 @@ 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 \
++ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976_dbdc.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975_dual.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975.bin \
+ $(1)/lib/firmware/mediatek
+ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ cp \
+ $(PKG_BUILD_DIR)/firmware/mt7986_wo_0.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_wo_1.bin \
-+ $(1)/lib/firmware/mediatek
-+endif
+ $(1)/lib/firmware/mediatek
+endif
endef
@@ -115,7 +114,7 @@
define KernelPackage/mt7921e/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \
-@@ -489,5 +555,6 @@ $(eval $(call KernelPackage,mt7921-common))
+@@ -513,5 +558,6 @@ $(eval $(call KernelPackage,mt7921-common))
$(eval $(call KernelPackage,mt7921u))
$(eval $(call KernelPackage,mt7921s))
$(eval $(call KernelPackage,mt7921e))
@@ -123,5 +122,5 @@
$(eval $(call KernelPackage,mt76))
$(eval $(call BuildPackage,mt76-test))
--
-2.29.2
+2.36.1