[openwrt/openwrt] qualcommax: ipq60xx: WAX610 remove unmountable oem partitions on upgrade

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/9df3d6b21c7e52d5a2cb913d7d690bab4b2e1a96

commit 9df3d6b21c7e52d5a2cb913d7d690bab4b2e1a96
Author: Erik Servili <serverror at serverror.com>
AuthorDate: Mon Jun 23 19:18:31 2025 +0200

    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 at serverror.com>
    Link: https://github.com/openwrt/openwrt/pull/19215
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 .../linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 25c3f66bef..d31363521f 100644
--- 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)"