[openwrt/openwrt] qualcommax: ipq807x: Create working factory tar for WAX620 and WAX630.

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/2758eebc76cc1b09c2551ef982c8bb28230665a1

commit 2758eebc76cc1b09c2551ef982c8bb28230665a1
Author: Erik Servili <serverror at serverror.com>
AuthorDate: Mon Mar 24 23:12:54 2025 +0100

    qualcommax: ipq807x: Create working factory tar for WAX620 and WAX630.
    
    Create factory tar for WAX620 and WAX630 which is accepted by the stock UI.
    Must use 'Boot up Backup Firmware' button on stock upgrade page after install and reboot to swap partitions.
    
    Signed-off-by: Erik Servili <serverror at serverror.com>
    Link: https://github.com/openwrt/openwrt/pull/18334
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/qualcommax/image/ipq807x.mk                        | 6 ++++--
 target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
index 48dd7f7a39..378f37501b 100644
--- a/target/linux/qualcommax/image/ipq807x.mk
+++ b/target/linux/qualcommax/image/ipq807x.mk
@@ -28,7 +28,7 @@ define Build/wax6xx-netgear-tar
 	mv $@ $@.tmp/nand-ipq807x-apps.img
 	md5sum $@.tmp/nand-ipq807x-apps.img | cut -c 1-32 > $@.tmp/nand-ipq807x-apps.md5sum
 	echo $(DEVICE_MODEL) > $@.tmp/metadata.txt
-	echo $(DEVICE_MODEL)"_V9.9.9.9" > $@.tmp/version
+	echo $(DEVICE_MODEL)"_V99.9.9.9" > $@.tmp/version
 	tar -C $@.tmp/ -cf $@ .
 	rm -rf $@.tmp
 endef
@@ -326,6 +326,8 @@ define Device/netgear_wax620
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	SOC := ipq8072
+	IMAGES += ui-factory.tar
+	IMAGE/ui-factory.tar := append-ubi | qsdk-ipq-factory-nand | pad-to 4096 | wax6xx-netgear-tar
 	DEVICE_PACKAGES := kmod-spi-gpio kmod-gpio-nxp-74hc164 \
 		ipq-wifi-netgear_wax620
 endef
@@ -341,7 +343,7 @@ define Device/netgear_wax630
 	PAGESIZE := 2048
 	SOC := ipq8074
 	IMAGES += ui-factory.tar
-	IMAGE/ui-factory.tar := append-ubi | wax6xx-netgear-tar
+	IMAGE/ui-factory.tar := append-ubi | qsdk-ipq-factory-nand | pad-to 4096 | wax6xx-netgear-tar
 	DEVICE_PACKAGES := kmod-spi-gpio ipq-wifi-netgear_wax630
 endef
 TARGET_DEVICES += netgear_wax630
diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount
index 176a5a144a..e7c20493b6 100755
--- a/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount
@@ -17,5 +17,9 @@ boot() {
 	linksys,mx8500)
 		mtd resetbc s_env || true
 	;;
+	netgear,wax620|\
+	netgear,wax630)
+		fw_setenv boot_count 0
+	;;
 	esac
 }