brcm47xx: rework vendor fw handling to don't duplicate upgrade calls

[openwrt/staging/lynxis.git] / target / linux / brcm47xx / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index 8c09706ee89cfcc2f22ece2fe482d1bc2b01a269..0fc0388f6d67d381c2d2d6615fc50043b33dd990 100644 (file)
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -45,7 +45,8 @@ platform_expected_image() {
                "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 WRT300N V1")   echo "cybertan EWCB"; return;;
+               "Linksys WRT300N V1.1") echo "cybertan EWC2"; return;;
                "Linksys WRT310N V1")   echo "cybertan 310N"; return;;
                "Linksys WRT310N V2")   echo "cybertan 310N"; return;;
                "Linksys WRT610N V1")   echo "cybertan 610N"; return;;
@@ -97,11 +98,10 @@ platform_check_image() {
                                error=1
                        }
 
-                       magic=$(get_magic_long_at "$1" "$header_len")
-                       [ "$magic" != "48445230" ] && {
+                       if ! otrx check "$1" -o "$header_len"; then
                                echo "No valid TRX firmware in the CHK image"
                                error=1
-                       }
+                       fi
                ;;
                "cybertan")
                        local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
@@ -113,13 +113,16 @@ platform_check_image() {
                                error=1
                        }
 
-                       magic=$(get_magic_long_at "$1" 32)
-                       [ "$magic" != "48445230" ] && {
+                       if ! otrx check "$1" -o 32; then
                                echo "No valid TRX firmware in the CyberTAN image"
                                error=1
-                       }
+                       fi
                ;;
                "trx")
+                       if ! otrx check "$1"; then
+                               echo "Invalid (corrupted?) TRX firmware"
+                               error=1
+                       fi
                ;;
                *)
                        echo "Invalid image type. Please use only .trx files"
@@ -130,29 +133,25 @@ platform_check_image() {
        return $error
 }
 
-platform_do_upgrade_chk() {
+platform_extract_trx_from_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" "$@"
+       dd if="$1" of="$2" bs=$header_len skip=1
 }
 
-platform_do_upgrade_cybertan() {
-       local trx="/tmp/$1.trx"
-
-       dd if="$1" of="$trx" bs=32 skip=1
-       shift
-       default_do_upgrade "$trx" "$@"
+platform_extract_trx_from_cybertan() {
+       dd if="$1" of="$2" bs=32 skip=1
 }
 
 platform_do_upgrade() {
        local file_type=$(brcm47xx_identify "$1")
+       local trx="$1"
 
        case "$file_type" in
-               "chk")          platform_do_upgrade_chk "$ARGV";;
-               "cybertan")     platform_do_upgrade_cybertan "$ARGV";;
-               *)              default_do_upgrade "$ARGV";;
+               "chk")          trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
+               "cybertan")     trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
        esac
+
+       shift
+       default_do_upgrade "$trx" "$@"
 }