diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh
index 04eed19a2d..5b43628264 100755
--- a/target/linux/imx6/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh
@@ -133,7 +133,7 @@ platform_pre_upgrade() {
 	toradex,apalis_imx6q-eval |\
 	toradex,apalis_imx6q-ixora |\
 	toradex,apalis_imx6q-ixora-v1.1 )
-		[ -z "$UPGRADE_BACKUP" ] && {
+		[ -z "$CONF_TAR" ] && {
 			jffs2reset -y
 			umount /overlay
 		}
diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
index 8a136d9439..3c616be8c8 100644
--- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh
+++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
@@ -109,7 +109,7 @@ platform_copy_config() {
 
 	if export_partdevice partdev 1; then
 		mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt
-		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+		cp -af "$CONF_TAR" "/mnt/$CONF_TAR"
 		umount /mnt
 	fi
 }
diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index 7fbdfbd401..f104604d9c 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -28,7 +28,7 @@ define Device/elecom_wrc-2533gent
   DEVICE_DTS := mt7622-elecom-wrc-2533gent
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
   DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb3 kmod-mt7615e \
-	kmod-mt7615-firmware mt7622bt-firmware swconfig
+	mt7622bt-firmware swconfig
 endef
 TARGET_DEVICES += elecom_wrc-2533gent
 
diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
index 8144476943..5efea1bcef 100755
--- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
@@ -40,7 +40,7 @@ platform_check_image() {
 platform_copy_config_emmc() {
 	mkdir -p /recovery
 	mount -o rw,noatime /dev/mmcblk0p6 /recovery
-	cp -af "$UPGRADE_BACKUP" "/recovery/$BACKUP_FILE"
+	cp -af "$CONF_TAR" "/recovery/$CONF_TAR"
 	sync
 	umount /recovery
 }
diff --git a/target/linux/mediatek/mt7622/target.mk b/target/linux/mediatek/mt7622/target.mk
index dd4459724e..d4ec3cb661 100644
--- a/target/linux/mediatek/mt7622/target.mk
+++ b/target/linux/mediatek/mt7622/target.mk
@@ -2,7 +2,7 @@ ARCH:=aarch64
 SUBTARGET:=mt7622
 BOARDNAME:=MT7622
 CPU_TYPE:=cortex-a53
-DEFAULT_PACKAGES += kmod-mt7615e kmod-mt7615-firmware wpad-basic
+DEFAULT_PACKAGES += kmod-mt7615e wpad-basic
 KERNELNAME:=Image dtbs
 
 define Target/Description
diff --git a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
index d3da22d496..bc27d4be5b 100755
--- a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
@@ -188,7 +188,7 @@ platform_copy_config() {
 		if [ -n "$recoverydev" ]; then
 			mkdir -p /tmp/recovery
 			mount -o rw,noatime "/dev/$recoverydev" -t vfat /tmp/recovery
-			cp -af "$UPGRADE_BACKUP" "/tmp/recovery/$BACKUP_FILE"
+			cp -af "$CONF_TAR" "/tmp/recovery/$CONF_TAR"
 			sync
 			umount /tmp/recovery
 		fi
diff --git a/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh b/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh
index faed0667f1..feeb9f1972 100644
--- a/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh
+++ b/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh
@@ -30,7 +30,7 @@ platform_copy_config() {
 
 	if export_partdevice partdev 1; then
 		mount -o rw,noatime "/dev/$partdev" /mnt
-		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+		cp -af "$CONF_TAR" "/mnt/$CONF_TAR"
 		umount /mnt
 	fi
 }