X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fmediatek%2Fmt7622%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=5836e1aa3ee4685d862e832f03fa101fcd05db57;hb=208f6c1232901835708eb4ace44ae17628fc12f5;hp=2cea6ce378009a619fbb148b2ea1bf96c6a8864a;hpb=02351861824a13ed158db1ef59aede2db6ba7568;p=openwrt%2Fstaging%2Fjow.git

diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
index 2cea6ce378..5836e1aa3e 100755
--- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
@@ -1,18 +1,65 @@
-RAMFS_COPY_BIN='fw_printenv fw_setenv'
-RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
+REQUIRE_IMAGE_METADATA=1
+RAMFS_COPY_BIN='fitblk'
+
+platform_get_bootdev() {
+	local rootdisk="$(cat /sys/firmware/devicetree/base/chosen/rootdisk)"
+	local handle bootdev
+	for handle in /sys/class/block/*/of_node/phandle /sys/class/block/*/device/of_node/phandle; do
+		[ ! -e "$handle" ] && continue
+		if [ "$rootdisk" = "$(cat $handle)" ]; then
+			bootdev="${handle%/of_node/phandle}"
+			bootdev="${bootdev%/device}"
+			bootdev="${bootdev#/sys/class/block/}"
+			echo "$bootdev"
+			break
+		fi
+	done
+}
 
 platform_do_upgrade() {
 	local board=$(board_name)
 	local file_type=$(identify $1)
 
 	case "$board" in
-	bananapi,bpi-r64-rootdisk)
-		#2097152=0x200000 is the offset in bytes from the start
-		#of eMMC and to the location of the kernel
-		get_image "$1" | dd of=/dev/mmcblk0 bs=2097152 seek=1 conv=fsync
+	bananapi,bpi-r64)
+		[ -e /dev/fit0 ] && fitblk /dev/fit0
+		[ -e /dev/fitrw ] && fitblk /dev/fitrw
+		bootdev="$(platform_get_bootdev)"
+		case "$bootdev" in
+		mmcblk*)
+			EMMC_KERN_DEV="/dev/$bootdev"
+			emmc_do_upgrade "$1"
+			;;
+		ubiblock*)
+			CI_KERNPART="fit"
+			nand_do_upgrade "$1"
+			;;
+		esac
+		;;
+
+	buffalo,wsr-2533dhp2|\
+	buffalo,wsr-3200ax4s)
+		local magic="$(get_magic_long "$1")"
+
+		# use "mtd write" if the magic is "DHP2 (0x44485032)"
+		# or "DHP3 (0x44485033)"
+		if [ "$magic" = "44485032" -o "$magic" = "44485033" ]; then
+			buffalo_upgrade_ubinized "$1"
+		else
+			CI_KERNPART="firmware"
+			nand_do_upgrade "$1"
+		fi
 		;;
-	linksys,e8450-ubi|\
-	mediatek,mt7622,ubi)
+	dlink,eagle-pro-ai-m32-a1|\
+	dlink,eagle-pro-ai-r32-a1|\
+	elecom,wrc-x3200gst3|\
+	mediatek,mt7622-rfb1-ubi|\
+	netgear,wax206|\
+	totolink,a8000ru|\
+	xiaomi,redmi-router-ax6s)
+		nand_do_upgrade "$1"
+		;;
+	linksys,e8450-ubi)
 		CI_KERNPART="fit"
 		nand_do_upgrade "$1"
 		;;
@@ -39,6 +86,20 @@ platform_check_image() {
 	[ "$#" -gt 1 ] && return 1
 
 	case "$board" in
+	buffalo,wsr-2533dhp2|\
+	buffalo,wsr-3200ax4s)
+		buffalo_check_image "$board" "$magic" "$1" || return 1
+		;;
+	dlink,eagle-pro-ai-m32-a1|\
+	dlink,eagle-pro-ai-r32-a1|\
+	elecom,wrc-x3200gst3|\
+	mediatek,mt7622-rfb1-ubi|\
+	netgear,wax206|\
+	totolink,a8000ru|\
+	xiaomi,redmi-router-ax6s)
+		nand_do_platform_check "$board" "$1"
+		return $?
+		;;
 	*)
 		[ "$magic" != "d00dfeed" ] && {
 			echo "Invalid image type."
@@ -51,18 +112,12 @@ platform_check_image() {
 	return 0
 }
 
-platform_copy_config_emmc() {
-	mkdir -p /recovery
-	mount -o rw,noatime /dev/mmcblk0p6 /recovery
-	cp -af "$UPGRADE_BACKUP" "/recovery/$BACKUP_FILE"
-	sync
-	umount /recovery
-}
-
 platform_copy_config() {
 	case "$(board_name)" in
-	bananapi,bpi-r64-rootdisk)
-		platform_copy_config_emmc
+	bananapi,bpi-r64)
+		if platform_get_bootdev | grep -q mmc; then
+			emmc_copy_config
+		fi
 		;;
 	esac
 }