ipq807x: prpl haze: fix sysupgrade not preserving settings

Settings were lost because mmc_do_upgrade does not align backup data to 64 KiB boundaries. Signed-off-by: Rodrigo Balerdi <[email protected]>
openwrt · Sep 28, 2024 · bb29b6f · bb29b6f
1 parent cf546a3
commit bb29b6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 87 deletions.
diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
@@ -308,7 +308,7 @@ define Device/prpl_haze
 	DEVICE_DTS_CONFIG := config@hk09
 	SOC := ipq8072
 	DEVICE_PACKAGES := ath11k-firmware-qcn9074 ipq-wifi-prpl_haze kmod-ath11k-pci \
-		mkf2fs f2fsck kmod-fs-f2fs kmod-leds-lp5562
+		kmod-fs-f2fs f2fs-tools kmod-leds-lp5562
 endef
 TARGET_DEVICES += prpl_haze
 

diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
@@ -184,9 +184,9 @@ platform_do_upgrade() {
 		nand_do_upgrade "$1"
 		;;
 	prpl,haze)
-		kernelname="0:HLOS"
-		rootfsname="rootfs"
-		mmc_do_upgrade "$1"
+		CI_KERNPART="0:HLOS"
+		CI_ROOTPART="rootfs"
+		emmc_do_upgrade "$1"
 		;;
 	qnap,301w|\
 	spectrum,sax1v1k)
@@ -267,6 +267,7 @@ platform_do_upgrade() {
 
 platform_copy_config() {
 	case "$(board_name)" in
+	prpl,haze|\
 	qnap,301w|\
 	spectrum,sax1v1k|\
 	zyxel,nbg7815)