projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: fix sysupgrade for jjPlus JWAP003
[openwrt/staging/chunkeey.git]
/
target
/
linux
/
ar71xx
/
base-files
/
lib
/
upgrade
/
platform.sh
diff --git
a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 86b98c337dabb3cc3f616693c279df5740d849e9..2a5c7c3ee61a9609a168615a73f7c6f04206ec5d 100755
(executable)
--- a/
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 20
09
OpenWrt.org
+# Copyright (C) 20
11
OpenWrt.org
#
. /lib/ar71xx.sh
#
. /lib/ar71xx.sh
@@
-15,7
+15,7
@@
platform_find_partitions() {
while read dev size erasesize name; do
name=${name#'"'}; name=${name%'"'}
case "$name" in
while read dev size erasesize name; do
name=${name#'"'}; name=${name%'"'}
case "$name" in
- vmlinux.bin.l7|
kernel|linux|rootfs
)
+ vmlinux.bin.l7|
vmlinux|kernel|linux|linux.bin|rootfs|filesystem
)
if [ -z "$first" ]; then
first="$name"
else
if [ -z "$first" ]; then
first="$name"
else
@@
-31,7
+31,7
@@
platform_find_kernelpart() {
local part
for part in "${1%:*}" "${1#*:}"; do
case "$part" in
local part
for part in "${1%:*}" "${1#*:}"; do
case "$part" in
- vmlinux.bin.l7|
kernel|linux
)
+ vmlinux.bin.l7|
vmlinux|kernel|linux|linux.bin
)
echo "$part"
break
;;
echo "$part"
break
;;
@@
-61,30
+61,126
@@
platform_do_upgrade_combined() {
fi
}
fi
}
+tplink_get_image_hwid() {
+ get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
platform_check_image() {
local board=$(ar71xx_board_name)
local magic="$(get_magic_word "$1")"
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
case "$board" in
[ "$ARGC" -gt 1 ] && return 1
case "$board" in
- ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh )
+ all0315n | \
+ all0258n )
+ platform_check_image_allnet "$1" && return 0
+ return 1
+ ;;
+ alfa-ap96 | \
+ alfa-nx | \
+ ap113 | \
+ ap121 | \
+ ap121-mini | \
+ ap136 | \
+ ap96 | \
+ db120 | \
+ hornet-ub | \
+ zcn-1523h-2 | \
+ zcn-1523h-5)
+ [ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && {
+ echo "Invalid image type."
+ return 1
+ }
+ return 0
+ ;;
+ ap81 | \
+ ap83 | \
+ dir-600-a1 | \
+ dir-615-c1 | \
+ dir-615-e4 | \
+ ew-dorin | \
+ ew-dorin-router | \
+ mzk-w04nu | \
+ mzk-w300nh | \
+ tew-632brp | \
+ tew-712br | \
+ wrt400n | \
+ airrouter | \
+ bullet-m | \
+ nanostation-m | \
+ rocket-m | \
+ rw2458n | \
+ wzr-hp-g300nh2 | \
+ wzr-hp-g300nh | \
+ wzr-hp-g450h | \
+ wzr-hp-ag300h | \
+ whr-g301n | \
+ whr-hp-g300n | \
+ whr-hp-gn | \
+ wlae-ag300n | \
+ nbg460n_550n_550nh | \
+ unifi )
[ "$magic" != "2705" ] && {
echo "Invalid image type."
return 1
}
return 0
;;
[ "$magic" != "2705" ] && {
echo "Invalid image type."
return 1
}
return 0
;;
- tl-wa901nd | tl-wr741nd | tl-wr841n-v1 | tl-wr941nd | tl-wr1043nd)
+
+ dir-825-b1 | \
+ tew-673gru)
+ dir825b_check_image "$1" && return 0
+ ;;
+
+ om2p | \
+ om2p-lc)
+ platform_check_image_om2p "$magic_long" "$1" && return 0
+ return 1
+ ;;
+ tl-mr11u | \
+ tl-mr3020 | \
+ tl-mr3040 | \
+ tl-mr3220 | \
+ tl-mr3420 | \
+ tl-wa901nd | \
+ tl-wa901nd-v2 | \
+ tl-wdr4300 | \
+ tl-wr703n | \
+ tl-wr741nd | \
+ tl-wr741nd-v4 | \
+ tl-wr841n-v1 | \
+ tl-wr841n-v7 | \
+ tl-wr841n-v8 | \
+ tl-wr941nd | \
+ tl-wr1041n-v2 | \
+ tl-wr1043nd | \
+ tl-wr2543n)
[ "$magic" != "0100" ] && {
echo "Invalid image type."
return 1
}
[ "$magic" != "0100" ] && {
echo "Invalid image type."
return 1
}
+
+ local hwid
+ local imageid
+
+ hwid=$(tplink_get_hwid)
+ imageid=$(tplink_get_image_hwid "$1")
+
+ [ "$hwid" != "$imageid" ] && {
+ echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."
+ return 1
+ }
+
return 0
;;
wndr3700)
return 0
;;
wndr3700)
- [ "$magic" != "3337" ] && {
- echo "Invalid image type."
+ local hw_magic
+
+ hw_magic="$(ar71xx_get_mtd_part_magic firmware)"
+ [ "$magic_long" != "$hw_magic" ] && {
+ echo "Invalid image, hardware ID mismatch, hw:$hw_magic image:$magic_long."
return 1
}
return 0
return 1
}
return 0
@@
-96,7
+192,16
@@
platform_check_image() {
}
return 0
;;
}
return 0
;;
- routerstation | routerstation-pro | ls-sr71 | pb42 | pb44)
+ routerstation | \
+ routerstation-pro | \
+ ls-sr71 | \
+ pb42 | \
+ pb44 | \
+ all0305 | \
+ eap7660d | \
+ ja76pf | \
+ ja76pf2 | \
+ jwap003)
[ "$magic" != "4349" ] && {
echo "Invalid image. Use *-sysupgrade.bin files on this board"
return 1
[ "$magic" != "4349" ] && {
echo "Invalid image. Use *-sysupgrade.bin files on this board"
return 1
@@
-123,9
+228,32
@@
platform_do_upgrade() {
local board=$(ar71xx_board_name)
case "$board" in
local board=$(ar71xx_board_name)
case "$board" in
- routerstation | routerstation-pro | ls-sr71)
+ routerstation | \
+ routerstation-pro | \
+ ls-sr71 | \
+ all0305 | \
+ eap7660d | \
+ pb42 | \
+ pb44 | \
+ ja76pf | \
+ ja76pf2 | \
+ jwap003)
platform_do_upgrade_combined "$ARGV"
;;
platform_do_upgrade_combined "$ARGV"
;;
+ all0258n )
+ platform_do_upgrade_allnet "0x9f050000" "$ARGV"
+ ;;
+ all0315n )
+ platform_do_upgrade_allnet "0x9f080000" "$ARGV"
+ ;;
+ dir-825-b1 |\
+ tew-673gru)
+ platform_do_upgrade_dir825b "$ARGV"
+ ;;
+ om2p | \
+ om2p-lc)
+ platform_do_upgrade_om2p "$ARGV"
+ ;;
*)
default_do_upgrade "$ARGV"
;;
*)
default_do_upgrade "$ARGV"
;;