X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=f5b9bda6901fc391746fb46a60f98d95c0c10bd3;hb=9c5aa7c528b45670a988a8c190acc06abe8a09c6;hp=1cb11b54757d6f0edcd900c3825363a550bfe4bb;hpb=c3e9796cd5473ddb6548532d5069934ca73d3641;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index 1cb11b5475..f5b9bda690 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -6,6 +6,53 @@ get_magic_long_at() {
 	dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
+platform_machine() {
+	grep "machine" /proc/cpuinfo | sed "s/.*:[ \t]*//"
+}
+
+platform_expected_image() {
+	local machine=$(platform_machine)
+
+	case "$machine" in
+		"Netgear WGR614 V8")	echo "chk U12H072T00_NETGEAR"; return;;
+		"Netgear WGR614 V9")	echo "chk U12H094T00_NETGEAR"; return;;
+		"Netgear WGR614 V10")	echo "chk U12H139T01_NETGEAR"; return;;
+		"Netgear WNDR3300")	echo "chk U12H093T00_NETGEAR"; return;;
+		"Netgear WNDR3400 V1")	echo "chk U12H155T00_NETGEAR"; return;;
+		"Netgear WNDR3400 V2")	echo "chk U12H187T00_NETGEAR"; return;;
+		"Netgear WNDR3400 V3")	echo "chk U12H208T00_NETGEAR"; return;;
+		"Netgear WNDR3400 Vcna")	echo "chk U12H155T01_NETGEAR"; return;;
+		"Netgear WNDR3700 V3")	echo "chk U12H194T00_NETGEAR"; return;;
+		"Netgear WNDR4000")	echo "chk U12H181T00_NETGEAR"; return;;
+		"Netgear WNDR4500 V1")	echo "chk U12H189T00_NETGEAR"; return;;
+		"Netgear WNDR4500 V2")	echo "chk U12H224T00_NETGEAR"; return;;
+		"Netgear WNR2000 V2")	echo "chk U12H114T00_NETGEAR"; return;;
+		"Netgear WNR3500L")	echo "chk U12H136T99_NETGEAR"; return;;
+		"Netgear WNR3500U")	echo "chk U12H136T00_NETGEAR"; return;;
+		"Netgear WNR3500 V2")	echo "chk U12H127T00_NETGEAR"; return;;
+		"Netgear WNR3500 V2vc")	echo "chk U12H127T70_NETGEAR"; return;;
+		"Netgear WNR834B V2")	echo "chk U12H081T00_NETGEAR"; return;;
+		"Linksys E900 V1")	echo "cybertan E900"; return;;
+		"Linksys E1000 V1")	echo "cybertan E100"; return;;
+		"Linksys E1000 V2")	echo "cybertan E100"; return;;
+		"Linksys E1000 V2.1")	echo "cybertan E100"; return;;
+		"Linksys E1200 V2")	echo "cybertan E122"; return;;
+		"Linksys E2000 V1")	echo "cybertan 32XN"; return;;
+		"Linksys E3000 V1")	echo "cybertan 61XN"; return;;
+		"Linksys E3200 V1")	echo "cybertan 3200"; return;;
+		"Linksys E4200 V1")	echo "cybertan 4200"; return;;
+		"Linksys WRT150N V1.1")	echo "cybertan N150"; return;;
+		"Linksys WRT150N V1")	echo "cybertan N150"; return;;
+		"Linksys WRT160N V1")	echo "cybertan N150"; return;;
+		"Linksys WRT160N V3")	echo "cybertan N150"; return;;
+		"Linksys WRT300N V1.1")	echo "cybertan EWCB"; return;;
+		"Linksys WRT310N V1")	echo "cybertan 310N"; return;;
+		"Linksys WRT310N V2")	echo "cybertan 310N"; return;;
+		"Linksys WRT610N V1")	echo "cybertan 610N"; return;;
+		"Linksys WRT610N V2")	echo "cybertan 610N"; return;;
+	esac
+}
+
 brcm47xx_identify() {
 	local magic
 
@@ -30,34 +77,94 @@ brcm47xx_identify() {
 	echo "unknown"
 }
 
+# $(1): image that should contain trx
+# $(2): trx offset in image
+platform_check_image_trx() {
+	local magic=$(get_magic_long_at "$1" $2)
+
+	[ "$magic" != "48445230" ] && {
+		return 1
+	}
+
+	# TODO: Check crc32
+
+	return 0
+}
+
 platform_check_image() {
 	[ "$#" -gt 1 ] && return 1
 
 	local file_type=$(brcm47xx_identify "$1")
+	local magic
+	local error=0
 
 	case "$file_type" in
 		"chk")
 			local header_len=$((0x$(get_magic_long_at "$1" 4)))
 			local board_id_len=$(($header_len - 40))
 			local board_id=$(dd if="$1" skip=40 bs=1 count=$board_id_len 2>/dev/null | hexdump -v -e '1/1 "%c"')
+			local dev_board_id=$(platform_expected_image)
 			echo "Found CHK image with device board_id $board_id"
-			echo "Flashing CHK images in unsupported. Please use only .trx files."
-			return 1
+
+			[ -n "$dev_board_id" -a "chk $board_id" != "$dev_board_id" ] && {
+				echo "Firmware board_id doesn't match device board_id ($dev_board_id)"
+				error=1
+			}
+
+			if ! platform_check_image_trx "$1" "$header_len"; then
+				echo "No valid TRX firmware in the CHK image"
+				error=1
+			fi
 		;;
 		"cybertan")
-			local magic=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
-			echo "Found CyberTAN image with device magic: $magic"
-			echo "Flashing CyberTAN images in unsupported. Please use only .trx files."
-			return 1
+			local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
+			local dev_pattern=$(platform_expected_image)
+			echo "Found CyberTAN image with device pattern: $pattern"
+
+			[ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && {
+				echo "Firmware pattern doesn't match device pattern ($dev_pattern)"
+				error=1
+			}
+
+			if ! platform_check_image_trx "$1" 32; then
+				echo "No valid TRX firmware in the CyberTAN image"
+				error=1
+			fi
 		;;
 		"trx")
-			return 0
 		;;
 		*)
 			echo "Invalid image type. Please use only .trx files"
-			return 1
+			error=1
 		;;
 	esac
+
+	return $error
+}
+
+platform_do_upgrade_chk() {
+	local header_len=$((0x$(get_magic_long_at "$1" 4)))
+	local trx="/tmp/$1.trx"
+
+	dd if="$1" of="$trx" bs=$header_len skip=1
+	shift
+	default_do_upgrade "$trx" "$@"
+}
+
+platform_do_upgrade_cybertan() {
+	local trx="/tmp/$1.trx"
+
+	dd if="$1" of="$trx" bs=32 skip=1
+	shift
+	default_do_upgrade "$trx" "$@"
 }
 
-# use default for platform_do_upgrade()
+platform_do_upgrade() {
+	local file_type=$(brcm47xx_identify "$1")
+
+	case "$file_type" in
+		"chk")		platform_do_upgrade_chk "$ARGV";;
+		"cybertan")	platform_do_upgrade_cybertan "$ARGV";;
+		*)		default_do_upgrade "$ARGV";;
+	esac
+}