brcm47xx: Fix sysupgrade with E1200v1

[openwrt/openwrt.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 0fc0388f6d67d381c2d2d6615fc50043b33dd990..f64e19b2135aa501016fc3875e6632f4256ed225 100644 (file)
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -6,17 +6,15 @@ 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)
+       local machine=$(board_name)
 
        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 WN2500RP V1")  echo "chk U12H197T00_NETGEAR"; return;;
+               "Netgear WN2500RP V2")  echo "chk U12H294T00_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;;
@@ -36,6 +34,7 @@ platform_expected_image() {
                "Linksys E1000 V1")     echo "cybertan E100"; return;;
                "Linksys E1000 V2")     echo "cybertan E100"; return;;
                "Linksys E1000 V2.1")   echo "cybertan E100"; return;;
+               "Linksys E1200 V1")     echo "cybetran E120"; return;;
                "Linksys E1200 V2")     echo "cybertan E122"; return;;
                "Linksys E2000 V1")     echo "cybertan 32XN"; return;;
                "Linksys E3000 V1")     echo "cybertan 61XN"; return;;
@@ -133,25 +132,25 @@ platform_check_image() {
        return $error
 }
 
-platform_extract_trx_from_chk() {
+platform_trx_from_chk_cmd() {
        local header_len=$((0x$(get_magic_long_at "$1" 4)))
 
-       dd if="$1" of="$2" bs=$header_len skip=1
+       echo -n dd bs=$header_len skip=1
 }
 
-platform_extract_trx_from_cybertan() {
-       dd if="$1" of="$2" bs=32 skip=1
+platform_trx_from_cybertan_cmd() {
+       echo -n dd bs=32 skip=1
 }
 
 platform_do_upgrade() {
        local file_type=$(brcm47xx_identify "$1")
        local trx="$1"
+       local cmd=""
 
        case "$file_type" in
-               "chk")          trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
-               "cybertan")     trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
+               "chk")          cmd=$(platform_trx_from_chk_cmd "$trx");;
+               "cybertan")     cmd=$(platform_trx_from_cybertan_cmd "$trx");;
        esac
 
-       shift
-       default_do_upgrade "$trx" "$@"
+       default_do_upgrade "$trx" "$cmd"
 }