ar71xx: rename COMFAST CF-E355AC to CF-E355AC v1

[openwrt/openwrt.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 21e387389d4ce2cf1200d35c9759d6bf1c8a2a4b..c408c7dfcec354b2f654341180e9ff70530a9669 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -208,7 +208,8 @@ platform_check_image() {
        carambola2|\
        cf-e316n-v2|\
        cf-e320n-v2|\
-       cf-e355ac|\
+       cf-e355ac-v1|\
+       cf-e355ac-v2|\
        cf-e375ac|\
        cf-e380ac-v1|\
        cf-e380ac-v2|\
@@ -233,6 +234,9 @@ platform_check_image() {
        dr342|\
        dr531|\
        dragino2|\
+       e1700ac-v2|\
+       e600g-v2|\
+       e600gac-v2|\
        ebr-2310-c1|\
        ens202ext|\
        epg5000|\
@@ -262,6 +266,7 @@ platform_check_image() {
        pqi-air-pen|\
        r36a|\
        r602n|\
+       rme-eg200|\
        rocket-m|\
        rocket-m-ti|\
        rocket-m-xw|\
@@ -390,6 +395,7 @@ platform_check_image() {
        omy-x1|\
        onion-omega|\
        oolite|\
+       re355|\
        re450|\
        rut900|\
        smart-300|\
@@ -685,45 +691,6 @@ platform_pre_upgrade() {
        local board=$(board_name)
 
        case "$board" in
-       c-60|\
-       hiveap-121|\
-       nbg6716|\
-       r6100|\
-       rambutan|\
-       rb-411|\
-       rb-411u|\
-       rb-433|\
-       rb-433u|\
-       rb-435g|\
-       rb-450|\
-       rb-450g|\
-       rb-493|\
-       rb-493g|\
-       rb-750|\
-       rb-750gl|\
-       rb-751|\
-       rb-751g|\
-       rb-911g-2hpnd|\
-       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-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|\
@@ -741,10 +708,6 @@ platform_pre_upgrade() {
                # erase firmware if booted from initramfs
                [ -z "$(rootfs_type)" ] && mtd erase firmware
                ;;
-       mr18|\
-       z1)
-               merakinand_do_upgrade "$1"
-               ;;
        esac
 }
 
@@ -833,6 +796,49 @@ platform_do_upgrade() {
        om5p-an)
                platform_do_upgrade_openmesh "$ARGV"
                ;;
+       c-60|\
+       hiveap-121|\
+       nbg6716|\
+       r6100|\
+       rambutan|\
+       rb-411|\
+       rb-411u|\
+       rb-433|\
+       rb-433u|\
+       rb-435g|\
+       rb-450|\
+       rb-450g|\
+       rb-493|\
+       rb-493g|\
+       rb-750|\
+       rb-750gl|\
+       rb-751|\
+       rb-751g|\
+       rb-911g-2hpnd|\
+       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-2011uas-2hnd|\
+       rb-2011uias|\
+       rb-2011uias-2hnd|\
+       rb-sxt2n|\
+       rb-sxt5n|\
+       wi2a-ac200i|\
+       wndr3700v4|\
+       wndr4300)
+               nand_do_upgrade "$1"
+               ;;
+       mr18|\
+       z1)
+               merakinand_do_upgrade "$1"
+               ;;
        uap-pro|\
        unifi-outdoor-plus)
                MTD_CONFIG_ARGS="-s 0x180000"
@@ -847,13 +853,3 @@ platform_do_upgrade() {
                ;;
        esac
 }
-
-disable_watchdog() {
-       killall watchdog
-       ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
-               echo 'Could not disable watchdog'
-               return 1
-       }
-}
-
-append sysupgrade_pre_upgrade disable_watchdog