From 050da2107a7eb2a571a8a3d0cee21cc6a44b72b8 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 7 May 2018 12:07:32 +0200
Subject: mediatek: backport upstream mediatek patches

Signed-off-by: John Crispin <john@phrozen.org>
---
 .../mediatek/base-files/lib/upgrade/platform.sh    | 64 ++++++++--------------
 1 file changed, 22 insertions(+), 42 deletions(-)

(limited to 'target/linux/mediatek/base-files/lib/upgrade')

diff --git a/target/linux/mediatek/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/base-files/lib/upgrade/platform.sh
index 0429ca8b89..646ce0dc53 100755
--- a/target/linux/mediatek/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/base-files/lib/upgrade/platform.sh
@@ -1,49 +1,29 @@
-#
-# Copyright (C) 2016 OpenWrt.org
-#
+platform_do_upgrade() {                 
+	default_do_upgrade "$ARGV"                                               
+}                                                                                
 
-platform_do_upgrade() {
-	local tar_file="$1"
-	local board="$(board_name)"
+PART_NAME=firmware
 
-	case "$(board_name)" in
-	mediatek,mt7623-rfb-nand-ephy |\
-	mediatek,mt7623-rfb-nand)
-		nand_do_upgrade $1
-		;;
-	*)
-		echo "flashing kernel"
-		tar xf $tar_file sysupgrade-$board/kernel -O | mtd write - kernel
+platform_check_image() {                                                         
+	local board=$(board_name)                                                
+	local magic="$(get_magic_long "$1")"                                     
 
-		echo "flashing rootfs"
-		tar xf $tar_file sysupgrade-$board/root -O | mtd write - rootfs
+	[ "$#" -gt 1 ] && return 1                                               
 
-		return 0
-		;;
-	esac
-}
+	case "$board" in                                                       
+	bananapi,bpi-r2)                                                       
+		[ "$magic" != "27051956" ] && {   
+			echo "Invalid image type."
+			return 1                                     
+		}                                                    
+		return 0                                             
+		;;                                                   
 
-platform_check_image() {
-	local tar_file="$1"
-	local board=$(board_name)
-
-	case "$board" in
-	bananapi,bpi-r2 |\
-	mediatek,mt7623a-rfb-emmc)
-		local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
-		local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`
-		;;
-
-	*)
+	*)                                                           
 		echo "Sysupgrade is not supported on your board yet."
-		return 1
-		;;
-	esac
-
-	[ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && {
-		echo "The upgarde image is corrupt."
-		return 1
-	}
+		return 1                                             
+		;;                                
+	esac                                      
 
-	return 0
-}
+	return 0                                                                                         
+}                   
-- 
cgit v1.2.3