X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=37c637b6f581341a206db747e78622192c6b46ae;hb=7f9f42d42eff837d2eca5b4862cbb3b1ccebbefd;hp=88e8e92a0d071c2c5446c0a0845368771ff3b61c;hpb=6165e4aab0e22b780b6b1dde887ed803a7c8210a;p=openwrt%2Fstaging%2Fwigyori.git diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 88e8e92a0d..37c637b6f5 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 @@ -183,26 +183,18 @@ alfa_check_image() { return 0 } -platform_nand_board_name() { - local board=$(ar71xx_board_name) - - case "$board" in - rb*) echo "routerboard";; - *) echo "$board";; - esac -} - 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")" [ "$#" -gt 1 ] && return 1 case "$board" in - airgatewaypro|\ airgateway|\ + airgatewaypro|\ airrouter|\ + ap121f|\ ap132|\ ap531b0|\ ap90q|\ @@ -210,11 +202,13 @@ platform_check_image() { archer-c58-v1|\ archer-c59-v1|\ archer-c60-v1|\ + archer-c7-v4|\ bullet-m|\ c-55|\ carambola2|\ cf-e316n-v2|\ cf-e320n-v2|\ + cf-e355ac|\ cf-e380ac-v1|\ cf-e380ac-v2|\ cf-e520n|\ @@ -235,6 +229,7 @@ platform_check_image() { dlan-hotspot|\ dlan-pro-1200-ac|\ dlan-pro-500-wp|\ + dr342|\ dr531|\ dragino2|\ ebr-2310-c1|\ @@ -242,13 +237,14 @@ platform_check_image() { epg5000|\ esr1750|\ esr900|\ - ew-dorin-router|\ ew-dorin|\ + ew-dorin-router|\ gl-ar150|\ gl-ar300m|\ gl-ar300|\ gl-domino|\ gl-mifi|\ + gl-usb150|\ hiwifi-hc6361|\ hornet-ub-x2|\ jwap230|\ @@ -256,14 +252,14 @@ platform_check_image() { loco-m-xw|\ mzk-w04nu|\ mzk-w300nh|\ - nanostation-m-xw|\ nanostation-m|\ + nanostation-m-xw|\ nbg460n_550n_550nh|\ pqi-air-pen|\ r602n|\ + rocket-m|\ rocket-m-ti|\ rocket-m-xw|\ - rocket-m|\ rw2458n|\ sc1750|\ sc300m|\ @@ -273,11 +269,12 @@ platform_check_image() { tew-712br|\ tew-732br|\ tew-823dru|\ + tl-wr1043n-v5|\ tl-wr942n-v1|\ + unifi|\ unifi-outdoor|\ unifiac-lite|\ unifiac-pro|\ - unifi|\ weio|\ whr-g301n|\ whr-hp-g300n|\ @@ -287,13 +284,14 @@ platform_check_image() { wpj342|\ wpj344|\ wpj531|\ + wpj558|\ wpj563|\ wrt400n|\ wrtnode2q|\ wzr-450hp2|\ wzr-hp-ag300h|\ - wzr-hp-g300nh2|\ wzr-hp-g300nh|\ + wzr-hp-g300nh2|\ wzr-hp-g450h|\ xd3200) [ "$magic" != "2705" ] && { @@ -305,13 +303,14 @@ platform_check_image() { ;; alfa-ap96|\ alfa-nx|\ - ap121-mini|\ ap121|\ + ap121-mini|\ ap135-020|\ ap136-010|\ ap136-020|\ ap147-010|\ ap152|\ + ap91-5g|\ ap96|\ arduino-yun|\ bhr-4grv2|\ @@ -323,7 +322,6 @@ platform_check_image() { hornet-ub|\ mr12|\ mr16|\ - wpj558|\ zbt-we1526|\ zcn-1523h-2|\ zcn-1523h-5) @@ -346,14 +344,14 @@ platform_check_image() { all0305|\ eap300v2|\ eap7660d|\ - ja76pf2|\ ja76pf|\ + ja76pf2|\ jwap003|\ ls-sr71|\ pb42|\ pb44|\ - routerstation-pro|\ routerstation|\ + routerstation-pro|\ wp543|\ wpe72) [ "$magic" != "4349" ] && { @@ -396,12 +394,12 @@ platform_check_image() { tl-mr12u|\ tl-mr13u|\ tl-mr3020|\ - tl-mr3040-v2|\ tl-mr3040|\ - tl-mr3220-v2|\ + tl-mr3040-v2|\ tl-mr3220|\ - tl-mr3420-v2|\ + tl-mr3220-v2|\ tl-mr3420|\ + tl-mr3420-v2|\ tl-mr6400|\ tl-wa701nd-v2|\ tl-wa7210n-v2|\ @@ -414,10 +412,11 @@ platform_check_image() { tl-wa850re-v2|\ tl-wa855re-v1|\ tl-wa860re|\ + tl-wa901nd|\ tl-wa901nd-v2|\ tl-wa901nd-v3|\ tl-wa901nd-v4|\ - tl-wa901nd|\ + tl-wa901nd-v5|\ tl-wdr3320-v2|\ tl-wdr3500|\ tl-wdr4300|\ @@ -425,32 +424,34 @@ platform_check_image() { tl-wdr6500-v2|\ tl-wpa8630|\ tl-wr1041n-v2|\ + tl-wr1043nd|\ tl-wr1043nd-v2|\ tl-wr1043nd-v4|\ - tl-wr1043nd|\ tl-wr2543n|\ tl-wr703n|\ tl-wr710n|\ tl-wr720n-v3|\ tl-wr740n-v6|\ - tl-wr741nd-v4|\ tl-wr741nd|\ + tl-wr741nd-v4|\ tl-wr802n-v1|\ tl-wr802n-v2|\ tl-wr810n|\ + tl-wr810n-v2|\ tl-wr840n-v2|\ tl-wr840n-v3|\ - tl-wr841n-v11|\ tl-wr841n-v1|\ tl-wr841n-v7|\ tl-wr841n-v8|\ tl-wr841n-v9|\ + tl-wr841n-v11|\ tl-wr842n-v2|\ tl-wr842n-v3|\ - tl-wr941nd-v5|\ - tl-wr941nd-v6|\ + tl-wr902ac-v1|\ tl-wr940n-v4|\ - tl-wr941nd) + tl-wr941nd|\ + tl-wr941nd-v5|\ + tl-wr941nd-v6) local magic_ver="0100" case "$board" in @@ -512,13 +513,14 @@ platform_check_image() { rb-911g-5hpacd|\ rb-912uag-2hpnd|\ rb-912uag-5hpnd|\ + rb-921gs-5hpacd-r2|\ rb-951g-2hnd|\ rb-951ui-2hnd|\ rb-2011l|\ rb-2011il|\ rb-2011uas|\ - rb-2011uias|\ rb-2011uas-2hnd|\ + rb-2011uias|\ rb-2011uias-2hnd|\ rb-sxt2n|\ rb-sxt5n) @@ -530,6 +532,7 @@ platform_check_image() { nbg6716|\ r6100|\ rambutan|\ + wi2a-ac200i|\ wndr3700v4|\ wndr4300) nand_do_platform_check $board $1 @@ -545,24 +548,24 @@ platform_check_image() { ;; a40|\ a60|\ - mr1750v2|\ mr1750|\ - mr600v2|\ + mr1750v2|\ mr600|\ - mr900v2|\ + mr600v2|\ mr900|\ + mr900v2|\ + om2p|\ + om2p-hs|\ om2p-hsv2|\ om2p-hsv3|\ om2p-hsv4|\ - om2p-hs|\ om2p-lc|\ om2pv2|\ om2pv4|\ - om2p|\ - om5p-acv2|\ + om5p|\ om5p-ac|\ - om5p-an|\ - om5p) + om5p-acv2|\ + om5p-an) platform_check_image_openmesh "$magic_long" "$1" && return 0 return 1 ;; @@ -651,14 +654,16 @@ platform_check_image() { # 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-map-2nd|\ rb-mapl-2nd|\ - tl-wr902ac-v1) + rb-wap-2nd) return 0 ;; esac @@ -668,7 +673,7 @@ platform_check_image() { } platform_pre_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in c-60|\ @@ -690,32 +695,37 @@ platform_pre_upgrade() { rb-751|\ rb-751g|\ rb-911g-2hpnd|\ - rb-911g-5hpnd|\ rb-911g-5hpacd|\ + rb-911g-5hpnd|\ rb-912uag-2hpnd|\ rb-912uag-5hpnd|\ + rb-921gs-5hpacd-r2|\ rb-951g-2hnd|\ rb-951ui-2hnd|\ rb-2011il|\ rb-2011l|\ rb-2011uas|\ - rb-2011uias|\ rb-2011uas-2hnd|\ + rb-2011uias|\ 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) + rb-map-2nd|\ + rb-mapl-2nd|\ + rb-wap-2nd) # erase firmware if booted from initramfs [ -z "$(rootfs_type)" ] && mtd erase firmware ;; @@ -727,7 +737,7 @@ platform_pre_upgrade() { } platform_nand_pre_upgrade() { - local board=$(ar71xx_board_name) + local board=$(board_name) case "$board" in rb*) @@ -738,11 +748,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) @@ -750,14 +777,14 @@ platform_do_upgrade() { ;; all0305|\ eap7660d|\ - ja76pf2|\ ja76pf|\ + ja76pf2|\ jwap003|\ ls-sr71|\ pb42|\ pb44|\ - routerstation-pro|\ - routerstation) + routerstation|\ + routerstation-pro) platform_do_upgrade_combined "$ARGV" ;; all0315n) @@ -774,24 +801,24 @@ platform_do_upgrade() { ;; a40|\ a60|\ - mr1750v2|\ mr1750|\ - mr600v2|\ + mr1750v2|\ mr600|\ - mr900v2|\ + mr600v2|\ mr900|\ + mr900v2|\ + om2p|\ + om2p-hs|\ om2p-hsv2|\ om2p-hsv3|\ om2p-hsv4|\ - om2p-hs|\ om2p-lc|\ om2pv2|\ om2pv4|\ - om2p|\ - om5p-acv2|\ + om5p|\ om5p-ac|\ - om5p-an|\ - om5p) + om5p-acv2|\ + om5p-an) platform_do_upgrade_openmesh "$ARGV" ;; uap-pro|\