ipq807x: nbg7815: use the standard eMMC sysupgrade code

Note that the old ad-hoc method did not explicitly align backup data to 64 KiB boundaries. Signed-off-by: Rodrigo Balerdi <[email protected]> Link: openwrt#16505 Signed-off-by: Robert Marko <[email protected]>
vincejv · Nov 17, 2024 · d1f9619 · d1f9619
1 parent 5a2dde9
commit d1f9619
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
@@ -446,7 +446,7 @@ define Device/zyxel_nbg7815
 	DEVICE_MODEL := NBG7815
 	DEVICE_DTS_CONFIG := config@nbg7815
 	SOC := ipq8074
-	DEVICE_PACKAGES := ipq-wifi-zyxel_nbg7815 kmod-ath11k-pci \
+	DEVICE_PACKAGES := kmod-fs-f2fs f2fs-tools ipq-wifi-zyxel_nbg7815 kmod-ath11k-pci \
 		kmod-bluetooth kmod-hwmon-tmp103
 endef
 TARGET_DEVICES += zyxel_nbg7815
diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
@@ -240,14 +240,13 @@ platform_do_upgrade() {
 		[ -z "$config_mtdnum" ] && reboot
 		part_num="$(hexdump -e '1/1 "%01x|"' -n 1 -s 168 -C /dev/mtd$config_mtdnum | cut -f 1 -d "|" | head -n1)"
 		if [ "$part_num" -eq "0" ]; then
-			kernelname="0:HLOS"
-			rootfsname="rootfs"
-			mmc_do_upgrade "$1"
+			CI_KERNPART="0:HLOS"
+			CI_ROOTPART="rootfs"
 		else
-			kernelname="0:HLOS_1"
-			rootfsname="rootfs_1"
-			mmc_do_upgrade "$1"
+			CI_KERNPART="0:HLOS_1"
+			CI_ROOTPART="rootfs_1"
 		fi
+		emmc_do_upgrade "$1"
 		;;
 	*)
 		default_do_upgrade "$1"
@@ -257,7 +256,8 @@ platform_do_upgrade() {
 
 platform_copy_config() {
 	case "$(board_name)" in
-	spectrum,sax1v1k)
+	spectrum,sax1v1k|\
+	zyxel,nbg7815)
 		emmc_copy_config
 		;;
 	esac