qualcommax: ipq60xx: WAX610 remove unmountable oem partitions on upgrade

When using TFTP install method on a fresh unit, wifi_fw and ubi_rootfs UBI volumes must be removed or will hang when mounting.

Signed-off-by: Erik Servili <serverror@serverror.com>
Link: https://github.com/openwrt/openwrt/pull/19215
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
index 25c3f66befba879ae9252296a2c81259240768d9..d31363521fe810d86b63c882fdf4d548a67853b7 100644 (file)
--- a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
@@ -118,11 +118,15 @@ platform_do_upgrade() {
        glinet,gl-ax1800|\
        glinet,gl-axt1800|\
        netgear,wax214|\
-       netgear,wax610|\
-       netgear,wax610y|\
        qihoo,360v6)
                nand_do_upgrade "$1"
                ;;
+       netgear,wax610|\
+       netgear,wax610y)
+               remove_oem_ubi_volume wifi_fw
+               remove_oem_ubi_volume ubi_rootfs
+               nand_do_upgrade "$1"
+               ;;
        linksys,mr7350|\
        linksys,mr7500)
                boot_part="$(fw_printenv -n boot_part)"