From: Mikhail Zhilkin <csharper2005@gmail.com>
Date: Sat, 30 Sep 2023 14:07:15 +0000 (+0000)
Subject: mediatek: fix eeprom loading (Mercusys MR90X v1)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=85b0d7592c454f2e4e02be043a1e433c67df4e41;p=openwrt%2Fstaging%2Fthess.git

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: e3aa645b267ca4f08773b5366583e9b0020fc3e9
Signed-off-by: Mikhail Zhilkin <csharper2005@gmail.com>
---

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 e4d33879c6..bc1dcb0008 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
@@ -21,6 +21,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