From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 11 Aug 2024 17:14:40 +0000 (+0100)
Subject: mediatek: mt7623: get rid of fitblk_get_bootdev
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0308b254d1fad4048dd15ec5b2136392b7b08c20;p=openwrt%2Fstaging%2Fstintel.git

mediatek: mt7623: get rid of fitblk_get_bootdev

Also migrate mt7623 to new fitblk support scripts which simplify
sysupgrade when using uImage.FIT. This had been forgotten previously.

Fixes: 4448d6325f ("mediatek: make use of common uImage.FIT upgrade functions")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
index 9cfb15cf3d..bce6709a58 100755
--- a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
@@ -1,4 +1,5 @@
 REQUIRE_IMAGE_METADATA=1
+RAMFS_COPY_BIN='fitblk'
 
 # Legacy full system upgrade including preloader for MediaTek SoCs on eMMC or SD
 legacy_mtk_mmc_full_upgrade() {
@@ -83,11 +84,7 @@ platform_do_upgrade() {
 	case "$board" in
 	bananapi,bpi-r2|\
 	unielec,u7623-02)
-		[ -e /dev/fit0 ] && fitblk /dev/fit0
-		[ -e /dev/fitrw ] && fitblk /dev/fitrw
-		bootdev="$(fitblk_get_bootdev)"
-		EMMC_KERN_DEV="/dev/$bootdev"
-		emmc_do_upgrade "$1"
+		fit_do_upgrade "$1"
 		;;
 	unielec,u7623-02-emmc-512m)
 		local magic="$(get_magic_long "$1")"