X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=97d560189ff71b903885b205c9021d7670bc3ab9;hb=2c9aff289e71689c07770efb2ce9e5f1b30960f2;hp=d48135a6d3b8251aecca6ad6215bf79c9effe132;hpb=f6a52bf3374682475e92c1960c19df8e6c1ea9b2;p=openwrt%2Fstaging%2Fmkresin.git diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index d48135a6d3..97d560189f 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -7,7 +7,7 @@ PART_NAME=firmware RAMFS_COPY_DATA=/lib/ar71xx.sh -[ -x /usr/sbin/nandwrite ] && RAMFS_COPY_BIN=/usr/sbin/nandwrite +RAMFS_COPY_BIN='nandwrite' CI_BLKSZ=65536 CI_LDADR=0x80060000 @@ -111,7 +111,7 @@ tplink_pharos_check_image() { # is accepted (loading the first 1.5M of a remote image for this check seems # a bit extreme) dd if="$1" bs=1 skip=1511432 count=1024 2>/dev/null | while read line; do - [ "$line" == "$model_string" ] && break + [ "$line" = "$model_string" ] && break done || { echo "Unsupported image (model not in support-list)" return 1 @@ -184,7 +184,7 @@ alfa_check_image() { } platform_nand_board_name() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in rb*) echo "routerboard";; @@ -193,7 +193,7 @@ platform_nand_board_name() { } platform_check_image() { - local board=$(ar71xx_board_name) + local board=$(board_name) local magic="$(get_magic_word "$1")" local magic_long="$(get_magic_long "$1")" @@ -203,8 +203,12 @@ platform_check_image() { airgatewaypro|\ airgateway|\ airrouter|\ + ap121f|\ ap132|\ + ap531b0|\ ap90q|\ + archer-c25-v1|\ + archer-c58-v1|\ archer-c59-v1|\ archer-c60-v1|\ bullet-m|\ @@ -212,10 +216,12 @@ platform_check_image() { carambola2|\ cf-e316n-v2|\ cf-e320n-v2|\ + cf-e355ac|\ cf-e380ac-v1|\ cf-e380ac-v2|\ cf-e520n|\ cf-e530n|\ + cpe505n|\ cpe830|\ cpe870|\ dgl-5500-a1|\ @@ -234,6 +240,7 @@ platform_check_image() { dr531|\ dragino2|\ ebr-2310-c1|\ + ens202ext|\ epg5000|\ esr1750|\ esr900|\ @@ -244,6 +251,7 @@ platform_check_image() { gl-ar300|\ gl-domino|\ gl-mifi|\ + gl-usb150|\ hiwifi-hc6361|\ hornet-ub-x2|\ jwap230|\ @@ -255,6 +263,7 @@ platform_check_image() { nanostation-m|\ nbg460n_550n_550nh|\ pqi-air-pen|\ + r602n|\ rocket-m-ti|\ rocket-m-xw|\ rocket-m|\ @@ -267,6 +276,7 @@ platform_check_image() { tew-712br|\ tew-732br|\ tew-823dru|\ + tl-wr942n-v1|\ unifi-outdoor|\ unifiac-lite|\ unifiac-pro|\ @@ -280,6 +290,8 @@ platform_check_image() { wpj342|\ wpj344|\ wpj531|\ + wpj558|\ + wpj563|\ wrt400n|\ wrtnode2q|\ wzr-450hp2|\ @@ -315,7 +327,6 @@ platform_check_image() { hornet-ub|\ mr12|\ mr16|\ - wpj558|\ zbt-we1526|\ zcn-1523h-2|\ zcn-1523h-5) @@ -394,6 +405,7 @@ platform_check_image() { tl-mr3220|\ tl-mr3420-v2|\ tl-mr3420|\ + tl-mr6400|\ tl-wa701nd-v2|\ tl-wa7210n-v2|\ tl-wa750re|\ @@ -403,6 +415,7 @@ platform_check_image() { tl-wa830re-v2|\ tl-wa850re|\ tl-wa850re-v2|\ + tl-wa855re-v1|\ tl-wa860re|\ tl-wa901nd-v2|\ tl-wa901nd-v3|\ @@ -422,11 +435,14 @@ platform_check_image() { tl-wr703n|\ tl-wr710n|\ tl-wr720n-v3|\ + tl-wr740n-v6|\ tl-wr741nd-v4|\ tl-wr741nd|\ tl-wr802n-v1|\ tl-wr802n-v2|\ tl-wr810n|\ + tl-wr840n-v2|\ + tl-wr840n-v3|\ tl-wr841n-v11|\ tl-wr841n-v1|\ tl-wr841n-v7|\ @@ -434,6 +450,7 @@ platform_check_image() { tl-wr841n-v9|\ tl-wr842n-v2|\ tl-wr842n-v3|\ + tl-wr902ac-v1|\ tl-wr941nd-v5|\ tl-wr941nd-v6|\ tl-wr940n-v4|\ @@ -502,6 +519,7 @@ platform_check_image() { rb-951g-2hnd|\ rb-951ui-2hnd|\ rb-2011l|\ + rb-2011il|\ rb-2011uas|\ rb-2011uias|\ rb-2011uas-2hnd|\ @@ -512,8 +530,11 @@ platform_check_image() { return $? ;; c-60|\ + hiveap-121|\ nbg6716|\ r6100|\ + rambutan|\ + wi2a-ac200i|\ wndr3700v4|\ wndr4300) nand_do_platform_check $board $1 @@ -633,10 +654,15 @@ platform_check_image() { return 0; ;; # these boards use metadata images + fritz300e|\ rb-750-r2|\ + rb-750p-pbr2|\ rb-750up-r2|\ rb-941-2nd|\ rb-951ui-2nd|\ + rb-952ui-5ac2nd|\ + rb-962uigs-5hact2hnt|\ + rb-lhg-5nd|\ rb-mapl-2nd) return 0 ;; @@ -647,12 +673,14 @@ platform_check_image() { } platform_pre_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in c-60|\ + hiveap-121|\ nbg6716|\ r6100|\ + rambutan|\ rb-411|\ rb-411u|\ rb-433|\ @@ -673,6 +701,7 @@ platform_pre_upgrade() { rb-912uag-5hpnd|\ rb-951g-2hnd|\ rb-951ui-2hnd|\ + rb-2011il|\ rb-2011l|\ rb-2011uas|\ rb-2011uias|\ @@ -680,10 +709,23 @@ platform_pre_upgrade() { rb-2011uias-2hnd|\ rb-sxt2n|\ rb-sxt5n|\ + wi2a-ac200i|\ wndr3700v4|\ wndr4300) nand_do_upgrade "$1" ;; + rb-750-r2|\ + rb-750p-pbr2|\ + rb-750up-r2|\ + rb-941-2nd|\ + rb-951ui-2nd|\ + rb-952ui-5ac2nd|\ + rb-962uigs-5hact2hnt|\ + rb-lhg-5nd|\ + rb-mapl-2nd) + # erase firmware if booted from initramfs + [ -z "$(rootfs_type)" ] && mtd erase firmware + ;; mr18|\ z1) merakinand_do_upgrade "$1" @@ -692,7 +734,7 @@ platform_pre_upgrade() { } platform_nand_pre_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in rb*) @@ -703,11 +745,28 @@ platform_nand_pre_upgrade() { mtd erase kernel tar xf "$1" sysupgrade-routerboard/kernel -O | nandwrite -o "$fw_mtd" - ;; + wi2a-ac200i) + case "$(fw_printenv -n dualPartition)" in + imgA) + fw_setenv dualPartition imgB + fw_setenv ActImg NokiaImageB + ;; + imgB) + fw_setenv dualPartition imgA + fw_setenv ActImg NokiaImageA + ;; + esac + ubiblock -r /dev/ubiblock0_0 2>/dev/null >/dev/null + rm -f /dev/ubiblock0_0 + ubidetach -d 0 2>/dev/null >/dev/null + CI_UBIPART=ubi_alt + CI_KERNPART=kernel_alt + ;; esac } platform_do_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in all0258n) @@ -729,7 +788,8 @@ platform_do_upgrade() { platform_do_upgrade_allnet "0x9f080000" "$ARGV" ;; cap4200ag|\ - eap300v2) + eap300v2|\ + ens202ext) platform_do_upgrade_allnet "0xbf0a0000" "$ARGV" ;; dir-825-b1|\