[openwrt/openwrt] mediatek: fix eeprom loading (Mercusys MR90X v1)

[LEDE Commits]

rmilecki pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/f8c149dcbd038f922c58050b9e7bbbf30edf7b41

commit f8c149dcbd038f922c58050b9e7bbbf30edf7b41
Author: Mikhail Zhilkin <csharper2005 at gmail.com>
AuthorDate: Sat Sep 30 14:07:15 2023 +0000

    mediatek: fix eeprom loading (Mercusys MR90X v1)
    
    Commit mt76: drop default eeprom file for mt7986-firmware
    (e3aa645b267ca4f08773b5366583e9b0020fc3e9) breaks eeprom loading for
    Mercusys MR90X v1. As a result WiFi is not working at all.
    
    This commit adds Mercusus MR90x to the caldata script (it works after the
    commit mentioned above). And we can safely drop "81_fix_eeprom" script
    as it's no longer required.
    
    Fixes: 5a0bdab24c0f ("mt76: drop default eeprom file for mt7986-firmware")
    Signed-off-by: Mikhail Zhilkin <csharper2005 at gmail.com>
    (cherry picked from commit 85b0d7592c454f2e4e02be043a1e433c67df4e41)
    [rmilecki: fix commit hash in Fixes]
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 .../base-files/etc/hotplug.d/firmware/11-mt76-caldata    |  8 ++++++++
 .../filogic/base-files/lib/preinit/81_fix_eeprom         | 16 ----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/firmware/11-mt76-caldata b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/firmware/11-mt76-caldata
index 4f9b4dc170..e782637348 100644
--- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/firmware/11-mt76-caldata
+++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/firmware/11-mt76-caldata
@@ -28,6 +28,14 @@ case "$FIRMWARE" in
 		;;
 	esac
 	;;
+"mediatek/mt7986_eeprom_mt7975_dual.bin")
+	case "$board" in
+	mercusys,mr90x-v1)
+		ln -sf /tmp/tp_data/MT7986_EEPROM.bin \
+			/lib/firmware/$FIRMWARE
+		;;
+	esac
+	;;
 "mediatek/mt7986_eeprom_mt7976.bin")
 	case "$board" in
 	acer,predator-w6)
diff --git a/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom b/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom
deleted file mode 100644
index 0a842facca..0000000000
--- a/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom
+++ /dev/null
@@ -1,16 +0,0 @@
-. /lib/functions/system.sh
-
-preinit_fix_eeprom() {
-	case $(board_name) in
-	mercusys,mr90x-v1)
-		eeprom="/lib/firmware/mediatek/mt7986_eeprom_mt7975_dual.bin"
-		oem="/tmp/tp_data/MT7986_EEPROM.bin"
-		[ ! -L $eeprom -a -e $oem ] && \
-			mv -f $eeprom $eeprom.bak && ln -s $oem $eeprom
-		;;
-	*)
-		;;
-	esac
-}
-
-boot_hook_add preinit_main preinit_fix_eeprom