treewide: fix invalid UPGRADE_OPT_SAVE_CONFIG spellings

[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 3068aa4235582d6e8fa5e27d2ccaac6a9d3f8f44..49d9bab959daa55e6aab7f2e1b6601761c65d92b 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -6,8 +6,8 @@
 . /lib/ar71xx.sh
 
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/ar71xx.sh
-RAMFS_COPY_BIN='nandwrite'
+RAMFS_COPY_DATA='/lib/ar71xx.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
+RAMFS_COPY_BIN='nandwrite fw_printenv fw_setenv'
 
 CI_BLKSZ=65536
 CI_LDADR=0x80060000
@@ -65,7 +65,7 @@ platform_do_upgrade_combined() {
        then
                local rootfspart=$(platform_find_rootfspart "$partitions" "$kernelpart")
                local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+               [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
                if [ "$PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD" -ne 1 ]; then
                    ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \
@@ -164,7 +164,7 @@ platform_do_upgrade_compex() {
 
        if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
                local append=""
-               [ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+               [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
                sync
                dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
@@ -218,6 +218,7 @@ platform_check_image() {
        archer-c7-v4|\
        archer-c7-v5|\
        bullet-m|\
+       bullet-m-xw|\
        c-55|\
        carambola2|\
        cf-e316n-v2|\
@@ -415,6 +416,7 @@ platform_check_image() {
        lan-turtle|\
        mc-mac1200r|\
        minibox-v1|\
+       minibox-v3.2|\
        omy-g1|\
        omy-x1|\
        onion-omega|\
@@ -556,6 +558,7 @@ platform_check_image() {
        rb-912uag-2hpnd|\
        rb-912uag-5hpnd|\
        rb-921gs-5hpacd-r2|\
+       rb-922uags-5hpacd|\
        rb-951g-2hnd|\
        rb-951ui-2hnd|\
        rb-2011l|\
@@ -565,6 +568,7 @@ platform_check_image() {
        rb-2011uas-2hnd|\
        rb-2011uias|\
        rb-2011uias-2hnd|\
+       rb-2011uias-2hnd-r2|\
        rb-sxt2n|\
        rb-sxt5n)
                nand_do_platform_check routerboard $1
@@ -588,7 +592,8 @@ platform_check_image() {
                tplink_pharos_check_image "$1" "7f454c46" "$(tplink_pharos_get_model_string)" '' && return 0
                return 1
                ;;
-       cpe210-v2)
+       cpe210-v2|\
+       cpe210-v3)
                tplink_pharos_check_image "$1" "01000000" "$(tplink_pharos_v2_get_model_string)" '\0\xff\r' && return 0
                return 1
                ;;
@@ -729,6 +734,7 @@ platform_check_image() {
        rb-lhg-5nd|\
        rb-map-2nd|\
        rb-mapl-2nd|\
+       rb-sxt-2nd-r3|\
        rb-wap-2nd|\
        rb-wapg-5hact2hnd|\
        rb-wapr-2nd)
@@ -757,6 +763,7 @@ platform_pre_upgrade() {
        rb-lhg-5nd|\
        rb-map-2nd|\
        rb-mapl-2nd|\
+       rb-sxt-2nd-r3|\
        rb-wap-2nd|\
        rb-wapg-5hact2hnd|\
        rb-wapr-2nd)
@@ -875,6 +882,7 @@ platform_do_upgrade() {
        rb-912uag-2hpnd|\
        rb-912uag-5hpnd|\
        rb-921gs-5hpacd-r2|\
+       rb-922uags-5hpacd|\
        rb-951g-2hnd|\
        rb-951ui-2hnd|\
        rb-2011il|\
@@ -884,6 +892,7 @@ platform_do_upgrade() {
        rb-2011uas-2hnd|\
        rb-2011uias|\
        rb-2011uias-2hnd|\
+       rb-2011uias-2hnd-r2|\
        rb-sxt2n|\
        rb-sxt5n|\
        wi2a-ac200i|\