diff --git a/autobuild/unified/filogic/mac80211/BE19000/master/defconfig b/autobuild/unified/filogic/mac80211/BE19000/master/defconfig
index 4c803fe..27e953e 100644
--- a/autobuild/unified/filogic/mac80211/BE19000/master/defconfig
+++ b/autobuild/unified/filogic/mac80211/BE19000/master/defconfig
@@ -1,12 +1,14 @@
 # CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_mediatek_mt7981-rfb is not set
 # CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_mediatek_mt7986a-rfb-nand is not set
 # CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_mediatek_mt7986b-rfb is not set
+CONFIG_PACKAGE_aqr10g-phy-firmware=y
 # CONFIG_PACKAGE_mt7981-wo-firmware is not set
 # CONFIG_PACKAGE_mt7986-wo-firmware is not set
 CONFIG_PACKAGE_kmod-usb3=y
 # CONFIG_PACKAGE_kmod-mt7915e is not set
 # CONFIG_PACKAGE_kmod-mt7981-firmware is not set
 # CONFIG_PACKAGE_kmod-mt7986-firmware is not set
+# CONFIG_PACKAGE_kmod-mt7992-23-firmware is not set
 # CONFIG_PACKAGE_kmod-mt7992-firmware is not set
 CONFIG_PACKAGE_e2fsprogs=y
 CONFIG_PACKAGE_f2fsck=y
diff --git a/autobuild/unified/filogic/mac80211/master/defconfig b/autobuild/unified/filogic/mac80211/master/defconfig
index 61f8ad5..852e220 100644
--- a/autobuild/unified/filogic/mac80211/master/defconfig
+++ b/autobuild/unified/filogic/mac80211/master/defconfig
@@ -1,5 +1,11 @@
+CONFIG_DEVEL=y
+CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y
+CONFIG_PACKAGE_bridger=y
 CONFIG_PACKAGE_kmod-mt76=y
+CONFIG_PACKAGE_kmod-mt7992-23-firmware=y
 CONFIG_PACKAGE_kmod-mt7992-firmware=y
+CONFIG_PACKAGE_kmod-mt7996-233-firmware=y
+CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_hostapd-utils=y
 CONFIG_PACKAGE_wpa-cli=y
 CONFIG_WPA_MSG_MIN_PRIORITY=2
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches/0001-wifi-mt76-mt7996-support-mt7996-2-3-3-variant.patch b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches/0001-wifi-mt76-mt7996-support-mt7996-2-3-3-variant.patch
deleted file mode 100644
index 84dfd8c..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches/0001-wifi-mt76-mt7996-support-mt7996-2-3-3-variant.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 0d0c1419ec432aa804ab478d889887b057d48821 Mon Sep 17 00:00:00 2001
-From: Shayne Chen <shayne.chen@mediatek.com>
-Date: Mon, 17 Jun 2024 16:03:16 +0800
-Subject: [PATCH] wifi: mt76: mt7996: support mt7996 2+3+3 variant
-
-Add support for mt7996 tri-band 2+3+3 variant.
-
-Co-developed-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
-Change-Id: Idd7ed0033e1255018bd03b434d3bd3eacfde7153
----
- mt7996/eeprom.c |  2 ++
- mt7996/init.c   | 25 +++++++++++++++++++++++++
- mt7996/mcu.c    |  9 ++++++++-
- mt7996/mt7996.h | 21 ++++++++++++++++-----
- mt7996/regs.h   |  1 +
- 5 files changed, 52 insertions(+), 6 deletions(-)
-
-diff --git a/mt7996/eeprom.c b/mt7996/eeprom.c
-index 4a823711..7e2d585a 100644
---- a/mt7996/eeprom.c
-+++ b/mt7996/eeprom.c
-@@ -26,6 +26,8 @@ static char *mt7996_eeprom_name(struct mt7996_dev *dev)
- {
- 	switch (mt76_chip(&dev->mt76)) {
- 	case 0x7990:
-+		if (dev->var_type == MT7996_VAR_TYPE_233)
-+			return MT7996_EEPROM_DEFAULT_233;
- 		return MT7996_EEPROM_DEFAULT;
- 	case 0x7992:
- 		return MT7992_EEPROM_DEFAULT;
-diff --git a/mt7996/init.c b/mt7996/init.c
-index 5e969732..ab1a9a8e 100644
---- a/mt7996/init.c
-+++ b/mt7996/init.c
-@@ -884,6 +884,27 @@ out:
- #endif
- }
- 
-+static int mt7996_chip_variant_init(struct mt7996_dev *dev)
-+{
-+	u32 val = mt76_rr(dev, MT_PAD_GPIO);
-+
-+	switch (mt76_chip(&dev->mt76)) {
-+	case 0x7990:
-+		if (u32_get_bits(val, MT_PAD_GPIO_2ADIE_TBTC))
-+			dev->var_type = MT7996_VAR_TYPE_233;
-+		else
-+			dev->var_type = MT7996_VAR_TYPE_444;
-+		break;
-+	case 0x7992:
-+		dev->var_type = MT7992_VAR_TYPE_44;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
- static int mt7996_init_hardware(struct mt7996_dev *dev)
- {
- 	int ret, idx;
-@@ -899,6 +920,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
- 	INIT_LIST_HEAD(&dev->wed_rro.poll_list);
- 	spin_lock_init(&dev->wed_rro.lock);
- 
-+	ret = mt7996_chip_variant_init(dev);
-+	if (ret)
-+		return ret;
-+
- 	ret = mt7996_dma_init(dev);
- 	if (ret)
- 		return ret;
-diff --git a/mt7996/mcu.c b/mt7996/mcu.c
-index 0a1e23e8..a638ef50 100644
---- a/mt7996/mcu.c
-+++ b/mt7996/mcu.c
-@@ -17,6 +17,11 @@
- 		_fw = MT7992_##name;				\
- 		break;						\
- 	case 0x7990:						\
-+		if ((_dev)->var_type == MT7996_VAR_TYPE_233)	\
-+			_fw = MT7996_##name##_233;		\
-+		else						\
-+			_fw = MT7996_##name;			\
-+		break;						\
- 	default:						\
- 		_fw = MT7996_##name;				\
- 		break;						\
-@@ -2851,6 +2856,7 @@ out:
- 
- static int mt7996_load_ram(struct mt7996_dev *dev)
- {
-+	const char *dsp_name;
- 	int ret;
- 
- 	ret = __mt7996_load_ram(dev, "WM", fw_name(dev, FIRMWARE_WM),
-@@ -2858,7 +2864,8 @@ static int mt7996_load_ram(struct mt7996_dev *dev)
- 	if (ret)
- 		return ret;
- 
--	ret = __mt7996_load_ram(dev, "DSP", fw_name(dev, FIRMWARE_DSP),
-+	dsp_name = is_mt7996(&dev->mt76) ? MT7996_FIRMWARE_DSP : MT7992_FIRMWARE_DSP;
-+	ret = __mt7996_load_ram(dev, "DSP", dsp_name,
- 				MT7996_RAM_TYPE_DSP);
- 	if (ret)
- 		return ret;
-diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
-index ab8c9070..a489dc54 100644
---- a/mt7996/mt7996.h
-+++ b/mt7996/mt7996.h
-@@ -34,12 +34,17 @@
- #define MT7996_FIRMWARE_DSP		"mediatek/mt7996/mt7996_dsp.bin"
- #define MT7996_ROM_PATCH		"mediatek/mt7996/mt7996_rom_patch.bin"
- 
-+#define MT7996_FIRMWARE_WA_233		"mediatek/mt7996/mt7996_wa_233.bin"
-+#define MT7996_FIRMWARE_WM_233		"mediatek/mt7996/mt7996_wm_233.bin"
-+#define MT7996_ROM_PATCH_233		"mediatek/mt7996/mt7996_rom_patch_233.bin"
-+
- #define MT7992_FIRMWARE_WA		"mediatek/mt7996/mt7992_wa.bin"
- #define MT7992_FIRMWARE_WM		"mediatek/mt7996/mt7992_wm.bin"
- #define MT7992_FIRMWARE_DSP		"mediatek/mt7996/mt7992_dsp.bin"
- #define MT7992_ROM_PATCH		"mediatek/mt7996/mt7992_rom_patch.bin"
- 
- #define MT7996_EEPROM_DEFAULT		"mediatek/mt7996/mt7996_eeprom.bin"
-+#define MT7996_EEPROM_DEFAULT_233	"mediatek/mt7996/mt7996_eeprom_233.bin"
- #define MT7992_EEPROM_DEFAULT		"mediatek/mt7996/mt7992_eeprom.bin"
- #define MT7996_EEPROM_SIZE		7680
- #define MT7996_EEPROM_BLOCK_SIZE	16
-@@ -89,6 +94,14 @@ struct mt7996_sta;
- struct mt7996_dfs_pulse;
- struct mt7996_dfs_pattern;
- 
-+enum mt7996_var_type {
-+	MT7996_VAR_TYPE_444,
-+	MT7996_VAR_TYPE_233,
-+
-+	/* mt7992 */
-+	MT7992_VAR_TYPE_44,
-+};
-+
- enum mt7996_ram_type {
- 	MT7996_RAM_TYPE_WM,
- 	MT7996_RAM_TYPE_WA,
-@@ -329,6 +342,7 @@ struct mt7996_dev {
- 	spinlock_t reg_lock;
- 
- 	u8 wtbl_size_group;
-+	u8 var_type;
- };
- 
- enum {
-@@ -406,11 +420,8 @@ mt7996_band_valid(struct mt7996_dev *dev, u8 band)
- 		return band <= MT_BAND1;
- 
- 	/* tri-band support */
--	if (band <= MT_BAND2 &&
--	    mt76_get_field(dev, MT_PAD_GPIO, MT_PAD_GPIO_ADIE_COMB) <= 1)
--		return true;
--
--	return band == MT_BAND0 || band == MT_BAND2;
-+	/* TODO: consider eagle dual band chip variant (2/5g) */
-+	return band <= MT_BAND2;
- }
- 
- extern const struct ieee80211_ops mt7996_ops;
-diff --git a/mt7996/regs.h b/mt7996/regs.h
-index 47b429d8..734abec4 100644
---- a/mt7996/regs.h
-+++ b/mt7996/regs.h
-@@ -662,6 +662,7 @@ enum offs_rev {
- 
- #define MT_PAD_GPIO				0x700056f0
- #define MT_PAD_GPIO_ADIE_COMB			GENMASK(16, 15)
-+#define MT_PAD_GPIO_2ADIE_TBTC			BIT(19)
- 
- #define MT_HW_REV				0x70010204
- #define MT_HW_REV1				0x8a00
--- 
-2.45.2
-
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-background-radar-cap-check-for-2-3-.patch b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-background-radar-cap-check-for-2-3-.patch
deleted file mode 100644
index 21e675a..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-background-radar-cap-check-for-2-3-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c307a3423ced37be475dd18adf65886aa8bb54d8 Mon Sep 17 00:00:00 2001
-From: Shayne Chen <shayne.chen@mediatek.com>
-Date: Fri, 30 Aug 2024 19:28:21 +0800
-Subject: [PATCH 2/2] wifi: mt76: mt7996: background radar cap check for 2+3+3
- sku
-
-Change-Id: I75928ec859f8f35692eabf17d1771df7f0da799b
----
- mt7996/init.c   |  7 ++++---
- mt7996/mt7996.h | 15 +++++++++++++++
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/mt7996/init.c b/mt7996/init.c
-index ab1a9a8e..03dfe5dc 100644
---- a/mt7996/init.c
-+++ b/mt7996/init.c
-@@ -390,9 +390,10 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
- 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
- 	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);
- 
--	if (!mdev->dev->of_node ||
--	    !of_property_read_bool(mdev->dev->of_node,
--				   "mediatek,disable-radar-background"))
-+	if (mt7996_get_background_radar_cap(phy->dev) &&
-+	    (!mdev->dev->of_node ||
-+	     !of_property_read_bool(mdev->dev->of_node,
-+				    "mediatek,disable-radar-background")))
- 		wiphy_ext_feature_set(wiphy,
- 				      NL80211_EXT_FEATURE_RADAR_BACKGROUND);
- 
-diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
-index e9fc6134..e7386a90 100644
---- a/mt7996/mt7996.h
-+++ b/mt7996/mt7996.h
-@@ -426,6 +426,21 @@ mt7996_band_valid(struct mt7996_dev *dev, u8 band)
- 	return band == MT_BAND0 || band == MT_BAND2;
- }
- 
-+static inline bool
-+mt7996_get_background_radar_cap(struct mt7996_dev *dev)
-+{
-+	switch (mt76_chip(&dev->mt76)) {
-+	case 0x7990:
-+		if (dev->var_type == MT7996_VAR_TYPE_233)
-+			return false;
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return true;
-+}
-+
- extern const struct ieee80211_ops mt7996_ops;
- extern struct pci_driver mt7996_pci_driver;
- extern struct pci_driver mt7996_hif_driver;
--- 
-2.45.2
-
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin
deleted file mode 100644
index ed3597b..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin
deleted file mode 100644
index 37511a9..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_24.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_24.bin
deleted file mode 100644
index 19aec4c..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_24.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin
deleted file mode 100644
index 5d567db..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin
deleted file mode 100644
index 20c5908..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin
deleted file mode 100644
index b0894b6..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin
deleted file mode 100644
index 226e2b3..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin
deleted file mode 100644
index cae73ac..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin
deleted file mode 100644
index dfc722e..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin
deleted file mode 100644
index 1fb990b..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_24.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_24.bin
deleted file mode 100644
index 6feaa4d..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_24.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin
deleted file mode 100644
index 3489c57..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin
deleted file mode 100644
index c15a207..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_24.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_24.bin
deleted file mode 100644
index d6bedba..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_24.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin
deleted file mode 100644
index 542cd54..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin
deleted file mode 100644
index 132beb0..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_24.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_24.bin
deleted file mode 100644
index 46b92ed..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_24.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin
deleted file mode 100644
index a6a4a71..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin
deleted file mode 100644
index db10ce2..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_24.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_24.bin
deleted file mode 100644
index 91cd9ae..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_24.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin
deleted file mode 100644
index 45fd63d..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin
deleted file mode 100644
index 6fb81b6..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin
deleted file mode 100644
index 11eaa85..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233_2i5i6i.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233_2i5i6i.bin
deleted file mode 100644
index 11eaa85..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233_2i5i6i.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin
deleted file mode 100644
index 5ad238a..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin
deleted file mode 100644
index b490256..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin
deleted file mode 100644
index 8538d92..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin
deleted file mode 100644
index f729c9a..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin
deleted file mode 100644
index 73a281b..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin
deleted file mode 100644
index d8b85e0..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin
deleted file mode 100644
index 8d5fd6e..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin
deleted file mode 100644
index 95ab39f..0000000
--- a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin
+++ /dev/null
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch b/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch
index 549d89c..7124548 100644
--- a/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch
+++ b/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch
@@ -1,90 +1,49 @@
 diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index 4d808c9..296a1aa 100644
+index 9a7c1f8..173a88a 100644
 --- a/package/kernel/mt76/Makefile
 +++ b/package/kernel/mt76/Makefile
-@@ -233,7 +233,7 @@ endef
- 
- define KernelPackage/mt7915e
-   $(KernelPackage/mt76-default)
--  TITLE:=MediaTek MT7915e wireless driver
-+  TITLE:=MediaTek MT7915e/MT7986/MT7916 wireless driver
-   DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
-   FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
-   AUTOLOAD:=$(call AutoProbe,mt7915e)
-@@ -317,12 +317,18 @@ endef
- 
+@@ -318,7 +318,7 @@ endef
  define KernelPackage/mt7996e
    $(KernelPackage/mt76-default)
--  TITLE:=MediaTek MT7996E wireless driver
+   TITLE:=MediaTek MT7996E wireless driver
 -  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
-+  TITLE:=MediaTek MT7996/MT7995/MT7919 wireless driver
-+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@DRIVER_11BE_SUPPORT +@KERNEL_RELAY
++  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY +@DRIVER_11BE_SUPPORT
    FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
    AUTOLOAD:=$(call AutoProbe,mt7996e)
  endef
+@@ -660,9 +660,11 @@ define KernelPackage/mt7992-firmware/install
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_2i5i.bin \
++		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_2i5e.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm.bin \
++		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_tm.bin \
+ 		$(1)/lib/firmware/mediatek/mt7996
+ endef
  
-+define KernelPackage/mt7992-firmware
-+  $(KernelPackage/mt76-default)
-+  TITLE:=MediaTek MT7992 firmware
-+  DEPENDS+=+kmod-mt7996e
-+endef
-+
- define KernelPackage/mt7996-firmware
-   $(KernelPackage/mt76-default)
-   TITLE:=MediaTek MT7996 firmware
-@@ -382,6 +388,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
-   NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
- endif
+@@ -675,6 +677,7 @@ define KernelPackage/mt7992-23-firmware/install
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch_23.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa_23.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_23.bin \
++		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_tm_23.bin \
+ 		$(1)/lib/firmware/mediatek/mt7996
+ endef
  
-+ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
-+  NOSTDINC_FLAGS += -DCONFIG_MAC80211_DEBUGFS
-+  PKG_MAKE_FLAGS += CONFIG_MAC80211_DEBUGFS=y
-+endif
-+
- ifdef CONFIG_PACKAGE_CFG80211_TESTMODE
-   NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE
-   PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y
-@@ -638,6 +649,35 @@ define KernelPackage/mt7996-firmware/install
+@@ -693,6 +696,7 @@ define KernelPackage/mt7996-firmware/install
  		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch.bin \
  		$(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_eeprom_2i5i6i.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch_233.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa_233.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_233.bin \
+ 		$(1)/lib/firmware/mediatek/mt7996
+ endef
+ 
+@@ -704,6 +708,7 @@ define KernelPackage/mt7996-233-firmware/install
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch_233.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa_233.bin \
+ 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_233.bin \
 +		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_tm_233.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom_233.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom_233_2i5i6i.bin \
-+		$(1)/lib/firmware/mediatek/mt7996
-+endef
-+
-+define KernelPackage/mt7992-firmware/install
-+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7996
-+	cp \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_tm.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_2i5i.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_2i5e.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa_23.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_23.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_tm_23.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch_23.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp_23.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23_2i5i.bin \
-+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
  		$(1)/lib/firmware/mediatek/mt7996
  endef
  
-@@ -692,5 +732,6 @@ $(eval $(call KernelPackage,mt7925u))
- $(eval $(call KernelPackage,mt7925e))
- $(eval $(call KernelPackage,mt7996e))
- $(eval $(call KernelPackage,mt7996-firmware))
-+$(eval $(call KernelPackage,mt7992-firmware))
- $(eval $(call KernelPackage,mt76))
- $(eval $(call BuildPackage,mt76-test))
-