ramips: sysupgrade: move nand_do_upgrade call to platform_do_upgrade

[openwrt/openwrt.git] / target / linux / ramips / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 7b12d97a00b34bb573c74e7991c9eb304ec008ef..f25d1e2a62602c9a90be33801aa7fb04e973f6a4 100755 (executable)
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -17,17 +17,19 @@ platform_check_image() {
        3g150b|\
        3g300m|\
        a5-v11|\
-       ac1200pro|\
        ai-br100|\
        air3gii|\
        all0239-3g|\
-       all0256n|\
+       all0256n-4M|\
+       all0256n-8M|\
        all5002|\
        all5003|\
        ar725w|\
-       asl26555|\
+       asl26555-8M|\
+       asl26555-16M|\
        awapn2403|\
-       awm002-evb|\
+       awm002-evb-4M|\
+       awm002-evb-8M|\
        awm003-evb|\
        bc2|\
        broadway|\
@@ -55,6 +57,7 @@ platform_check_image() {
        esr-9753|\
        ew1200|\
        ex2700|\
+       ex3700|\
        f7c027|\
        firewrt|\
        fonera20n|\
@@ -62,6 +65,7 @@ platform_check_image() {
        gl-mt300a|\
        gl-mt300n|\
        gl-mt750|\
+       gl-mt300n-v2|\
        hc5*61|\
        hc5661a|\
        hg255d|\
@@ -73,6 +77,7 @@ platform_check_image() {
        jhr-n805r|\
        jhr-n825r|\
        jhr-n926r|\
+       kn|\
        kn_rc|\
        kn_rf|\
        kng_rc|\
@@ -80,7 +85,8 @@ platform_check_image() {
        linkits7688d|\
        m2m|\
        m3|\
-       m4|\
+       m4-4M|\
+       m4-8M|\
        mac1200rv2|\
        microwrt|\
        miniembplug|\
@@ -103,7 +109,8 @@ platform_check_image() {
        nbg-419n|\
        nbg-419n2|\
        newifi-d1|\
-       nixcore|\
+       nixcore-x1-8M|\
+       nixcore-x1-16M|\
        nw718|\
        omega2|\
        omega2p|\
@@ -111,14 +118,17 @@ platform_check_image() {
        pbr-d1|\
        pbr-m1|\
        psg1208|\
-       psg1218|\
+       psg1218a|\
+       psg1218b|\
        psr-680w|\
-       px-4885|\
+       px-4885-4M|\
+       px-4885-8M|\
        rb750gr3|\
        re6500|\
        rp-n53|\
        rt5350f-olinuxino|\
        rt5350f-olinuxino-evb|\
+       rt-ac51u|\
        rt-g32-b1|\
        rt-n10-plus|\
        rt-n13u|\
@@ -137,7 +147,8 @@ platform_check_image() {
        ur-326n4g|\
        ur-336un|\
        v22rw-2x2|\
-       vocore|\
+       vocore-8M|\
+       vocore-16M|\
        vocore2|\
        vr500|\
        w150m|\
@@ -163,15 +174,18 @@ platform_check_image() {
        wn3000rpv3|\
        wnce2001|\
        wndr3700v5|\
-       wr512-3gn|\
+       wr512-3gn-4M|\
+       wr512-3gn-8M|\
        wr6202|\
        wrh-300cr|\
        wrtnode|\
        wrtnode2r |\
        wrtnode2p |\
        wsr-600|\
-       wt1520|\
-       wt3020|\
+       wt1520-4M|\
+       wt1520-8M|\
+       wt3020-4M|\
+       wt3020-8M|\
        wzr-agl300nh|\
        x5|\
        x8|\
@@ -180,9 +194,13 @@ platform_check_image() {
        zbt-ape522ii|\
        zbt-cpe102|\
        zbt-wa05|\
-       zbt-we826|\
+       zbt-we1326|\
+       zbt-we2026|\
+       zbt-we826-16M|\
+       zbt-we826-32M|\
        zbt-wg2626|\
-       zbt-wg3526|\
+       zbt-wg3526-16M|\
+       zbt-wg3526-32M|\
        zbt-wr8305rt|\
        zte-q7|\
        youku-yk1)
@@ -262,7 +280,7 @@ platform_nand_pre_upgrade() {
        esac
 }
 
-platform_pre_upgrade() {
+platform_do_upgrade() {
        local board=$(ramips_board_name)
 
        case "$board" in
@@ -271,13 +289,6 @@ platform_pre_upgrade() {
        ubnt-erx)
                nand_do_upgrade "$ARGV"
                ;;
-       esac
-}
-
-platform_do_upgrade() {
-       local board=$(ramips_board_name)
-
-       case "$board" in
        *)
                default_do_upgrade "$ARGV"
                ;;