From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 20 Jul 2020 15:25:49 +0000 (+0100)
Subject: mediatek: mt7623: increase flexibility of finding recovery partition
X-Git-Tag: v21.02.0-rc1~2103
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a1eaa446b07ebf516a43db609ccbf169baadcae;p=openwrt%2Fstaging%2Fpepe2k.git

mediatek: mt7623: increase flexibility of finding recovery partition

I'm about to change the layout of the images for UniElec U7623 so make it
find the recovery partition based on which the root partition is too.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac b/target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac
index 60b699d9c9..7b165df565 100644
--- a/target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac
+++ b/target/linux/mediatek/mt7623/base-files/lib/preinit/07_set_iface_mac
@@ -42,16 +42,22 @@ preinit_set_mac_address() {
 	local rootpart
 
 	case $(board_name) in
-	bananapi,bpi-r2)
+	bananapi,bpi-r2|\
+	unielec,u7623-02-emmc-512m)
 		rootpart=$(cat /proc/cmdline)
 		rootpart="${rootpart##*root=}"
-		rootpart="${rootpart%%p3 *}"
-		if [ "$rootpart" = "/dev/mmcblk0" -o "$rootpart" = "/dev/mmcblk1" ]; then
-			set_recovery_mac_address ${rootpart}p2
-		fi
-		;;
-	unielec,u7623-02-emmc-512m)
-		set_recovery_mac_address /dev/mmcblk0p1
+		rootpart="${rootpart%% *}"
+		case $rootpart in
+		/dev/mmcblk0p2) # Legacy U7623 image
+			set_recovery_mac_address /dev/mmcblk0p1
+			;;
+		/dev/mmcblk0p3) # U7623 or Banana Pi R2 eMMC
+			set_recovery_mac_address /dev/mmcblk0p2
+			;;
+		/dev/mmcblk1p3) # Banana Pi R2 SD
+			set_recovery_mac_address /dev/mmcblk1p2
+			;;
+		esac
 		;;
 	esac
 }