X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=dfec1336fcdb28aaed4dee5d4a26b767333fecc7;hb=803e9c704e9b69f229f9aaefc3a03ad668c17051;hp=839ba4e77b2a37f7554f13d3ac0fc770949abd8a;hpb=98e9f3d20531728dfe29bc27e6c06cc9f8b62d42;p=openwrt.git diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 839ba4e77b..dfec1336fc 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -73,12 +73,45 @@ seama_get_type_magic() { get_image "$@" | dd bs=1 count=4 skip=53 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } +cybertan_get_image_magic() { + get_image "$@" | dd bs=8 count=1 skip=0 2>/dev/null | hexdump -v -n 8 -e '1/1 "%02x"' +} + +cybertan_check_image() { + local magic="$(cybertan_get_image_magic "$1")" + local fw_magic="$(cybertan_get_hw_magic)" + + [ "$fw_magic" != "$magic" ] && { + echo "Invalid image, ID mismatch, got:$magic, but need:$fw_magic" + return 1 + } + + return 0 +} + +platform_do_upgrade_compex() { + local fw_file=$1 + local fw_part=$PART_NAME + local fw_mtd=$(find_mtd_part $fw_part) + local fw_length=0x$(dd if="$fw_file" bs=2 skip=1 count=4 2>/dev/null) + local fw_blocks=$(($fw_length / 65536)) + + if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then + local append="" + [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + + sync + dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \ + mtd $append write - "$fw_part" + fi +} + platform_check_image() { local board=$(ar71xx_board_name) local magic="$(get_magic_word "$1")" local magic_long="$(get_magic_long "$1")" - [ "$ARGC" -gt 1 ] && return 1 + [ "$#" -gt 1 ] && return 1 case "$board" in all0315n | \ @@ -116,6 +149,7 @@ platform_check_image() { dir-615-e4 | \ dir-825-c1 | \ dir-835-a1 | \ + dragino2 | \ ew-dorin | \ ew-dorin-router | \ hornet-ub-x2 | \ @@ -155,7 +189,14 @@ platform_check_image() { dir825b_check_image "$1" && return 0 ;; - mynet-n600) + mynet-rext|\ + wrt160nl) + cybertan_check_image "$1" && return 0 + return 1 + ;; + + mynet-n600 | \ + mynet-n750) [ "$magic_long" != "5ea3a417" ] && { echo "Invalid image, bad magic: $magic_long" return 1 @@ -179,6 +220,7 @@ platform_check_image() { ;; archer-c7 | \ + oolite | \ tl-mr10u | \ tl-mr11u | \ tl-mr13u | \ @@ -192,10 +234,13 @@ platform_check_image() { tl-wa7510n | \ tl-wa750re | \ tl-wa850re | \ + tl-wa801nd-v2 | \ tl-wa901nd | \ tl-wa901nd-v2 | \ + tl-wa901nd-v3 | \ tl-wdr3500 | \ tl-wdr4300 | \ + tl-wdr4900-v2 | \ tl-wr703n | \ tl-wr710n | \ tl-wr720n-v3 | \ @@ -204,6 +249,7 @@ platform_check_image() { tl-wr841n-v1 | \ tl-wr841n-v7 | \ tl-wr841n-v8 | \ + tl-wr841n-v9 | \ tl-wr842n-v2 | \ tl-wr941nd | \ tl-wr1041n-v2 | \ @@ -254,13 +300,6 @@ platform_check_image() { } return 0 ;; - wrt160nl) - [ "$magic" != "4e4c" ] && { - echo "Invalid image type." - return 1 - } - return 0 - ;; routerstation | \ routerstation-pro | \ ls-sr71 | \ @@ -270,7 +309,9 @@ platform_check_image() { eap7660d | \ ja76pf | \ ja76pf2 | \ - jwap003) + jwap003 | \ + wp543 | \ + wpe72) [ "$magic" != "4349" ] && { echo "Invalid image. Use *-sysupgrade.bin files on this board" return 1 @@ -309,6 +350,10 @@ platform_do_upgrade() { jwap003) platform_do_upgrade_combined "$ARGV" ;; + wp543|\ + wpe72) + platform_do_upgrade_compex "$ARGV" + ;; all0258n ) platform_do_upgrade_allnet "0x9f050000" "$ARGV" ;;