[][MAC80211][WiFi7][misc][Rename eeprom of eFEM variants]
[Description]
Change eeprom name of eFEM variants.
Omit _2e5e postfix which aligns the naming rule to mt7996.
[Release-log]
N/A
Change-Id: Ibe8520ffa5950857cbf586f08478c29ac3b2e752
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9678984
diff --git a/autobuild/autobuild_5.4_mac80211_release/0003-wifi6-mt76-makefile-for-new-chip.patch b/autobuild/autobuild_5.4_mac80211_release/0003-wifi6-mt76-makefile-for-new-chip.patch
index 6e26a15..9e5e590 100644
--- a/autobuild/autobuild_5.4_mac80211_release/0003-wifi6-mt76-makefile-for-new-chip.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/0003-wifi6-mt76-makefile-for-new-chip.patch
@@ -183,14 +183,14 @@
+ $(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_2e5e.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_2e5e.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
$(1)/lib/firmware/mediatek/mt7996
endef
diff --git a/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch b/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch
index 17f8462..ce8cd55 100644
--- a/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/0003-wifi7-mt76-makefile-for-new-chip.patch
@@ -176,14 +176,14 @@
+ $(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_2e5e.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_2e5e.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
+ $(1)/lib/firmware/mediatek/mt7996
+endef
+
@@ -193,7 +193,7 @@
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7990_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7990_wm.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7990_wm_tm.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7990_eeprom_2e5e.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7996/mt7990_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7990_eeprom_2i5i.bin \
$(1)/lib/firmware/mediatek/mt7996
endef
diff --git a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-mt76-mt7996-add-support-for-different-variants.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-mt76-mt7996-add-support-for-different-variants.patch
index ecfd7e3..338e4a1 100644
--- a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-mt76-mt7996-add-support-for-different-variants.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-mt76-mt7996-add-support-for-different-variants.patch
@@ -240,11 +240,11 @@
#define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin"
-#define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin"
+#define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin"
-+#define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom_2e5e.bin"
++#define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin"
+#define MT7992_EEPROM_DEFAULT_INT "mediatek/mt7996/mt7992_eeprom_2i5i.bin"
+#define MT7992_EEPROM_DEFAULT_MIX "mediatek/mt7996/mt7992_eeprom_2i5e.bin"
+#define MT7992_EEPROM_DEFAULT_24 "mediatek/mt7996/mt7992_eeprom_24_2i5i.bin"
-+#define MT7992_EEPROM_DEFAULT_23 "mediatek/mt7996/mt7992_eeprom_23_2e5e.bin"
++#define MT7992_EEPROM_DEFAULT_23 "mediatek/mt7996/mt7992_eeprom_23.bin"
+#define MT7992_EEPROM_DEFAULT_23_INT "mediatek/mt7996/mt7992_eeprom_23_2i5i.bin"
#define MT7996_EEPROM_SIZE 7680
#define MT7996_EEPROM_BLOCK_SIZE 16
diff --git a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-mt76-mt7996-refactor-eeprom-loading-flow-for-sku.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-mt76-mt7996-refactor-eeprom-loading-flow-for-sku.patch
index 0d79f7d..c99386d 100644
--- a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-mt76-mt7996-refactor-eeprom-loading-flow-for-sku.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-mt76-mt7996-refactor-eeprom-loading-flow-for-sku.patch
@@ -448,7 +448,7 @@
#define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin"
+#define MT7996_EEPROM_DEFAULT_INT "mediatek/mt7996/mt7996_eeprom_2i5i6i.bin"
#define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin"
- #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom_2e5e.bin"
+ #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin"
#define MT7992_EEPROM_DEFAULT_INT "mediatek/mt7996/mt7992_eeprom_2i5i.bin"
diff --git a/mt7996/mtk_debugfs.c b/mt7996/mtk_debugfs.c
index c096fb6c..053005dd 100644
diff --git a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-mt76-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-mt76-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
index c5474a3..d27a9ea 100644
--- a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-mt76-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-mt76-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
@@ -141,7 +141,7 @@
+#define MT7996_EEPROM_DEFAULT_233 "mediatek/mt7996/mt7996_eeprom_233.bin"
+#define MT7996_EEPROM_DEFAULT_233_INT "mediatek/mt7996/mt7996_eeprom_233_2i5i6i.bin"
#define MT7996_EEPROM_DEFAULT_404 "mediatek/mt7996/mt7996_eeprom_dual_404.bin"
- #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom_2e5e.bin"
+ #define MT7992_EEPROM_DEFAULT "mediatek/mt7996/mt7992_eeprom.bin"
#define MT7992_EEPROM_DEFAULT_INT "mediatek/mt7996/mt7992_eeprom_2i5i.bin"
@@ -122,6 +130,7 @@ enum mt7996_fem_type {
enum mt7996_sku_type {
diff --git a/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7990_eeprom_2e5e.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7990_eeprom.bin
similarity index 100%
rename from autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7990_eeprom_2e5e.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7990_eeprom.bin
Binary files differ
diff --git a/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin
similarity index 100%
rename from autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin
Binary files differ
diff --git a/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin
similarity index 100%
rename from autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin
similarity index 100%
rename from autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin
rename to autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom.bin
Binary files differ
diff --git a/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin b/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin
similarity index 100%
rename from autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin
rename to autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23.bin
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 959ac41..549d89c 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
@@ -69,14 +69,14 @@
+ $(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_2e5e.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_2e5e.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
$(1)/lib/firmware/mediatek/mt7996
endef