ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 06:57:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ipq807x: prpl haze & qnap 301w: use the standard eMMC sysupgrade code

Browse Source 
Note that the old ad-hoc method did not explicitly align backup data
to 64 KiB boundaries.

Also note that the qnap 301w has a 'rootfs_data' partition in the eMMC
that is being ignored by fstools during boot, presumably due to a bug.
This is why the partition is also ignored in the sysupgrade code and
there is no definition of CI_DATAPART="rootfs_data".

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16505
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit fe481c9c47)
Link: https://github.com/openwrt/openwrt/pull/17097
Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Rodrigo Balerdi 2024-11-08 17:40:03 -03:00 committed by Petr Štetiar
parent 1eade612f9
commit 16eb043062
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/qualcommax/image/ipq807x.mk
View File

@ -308,7 +308,7 @@ define Device/prpl_haze
DEVICE_DTS_CONFIG := config@hk09 DEVICE_DTS_CONFIG := config@hk09
SOC := ipq8072 SOC := ipq8072
DEVICE_PACKAGES := ath11k-firmware-qcn9074 ipq-wifi-prpl_haze kmod-ath11k-pci \ 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 endef
TARGET_DEVICES += prpl_haze TARGET_DEVICES += prpl_haze
@ -320,7 +320,7 @@ define Device/qnap_301w
DEVICE_DTS_CONFIG := config@hk01 DEVICE_DTS_CONFIG := config@hk01
KERNEL_SIZE := 16384k KERNEL_SIZE := 16384k
SOC := ipq8072 SOC := ipq8072
DEVICE_PACKAGES := ipq-wifi-qnap_301w DEVICE_PACKAGES := kmod-fs-f2fs f2fs-tools ipq-wifi-qnap_301w
endef endef
TARGET_DEVICES += qnap_301w TARGET_DEVICES += qnap_301w

8
target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
View File

@ -185,9 +185,9 @@ platform_do_upgrade() {
;; ;;
prpl,haze|\ prpl,haze|\
qnap,301w) qnap,301w)
kernelname="0:HLOS" CI_KERNPART="0:HLOS"
rootfsname="rootfs" CI_ROOTPART="rootfs"
mmc_do_upgrade "$1" emmc_do_upgrade "$1"
;; ;;
tplink,eap660hd-v1) tplink,eap660hd-v1)
tplink_do_upgrade "$1" tplink_do_upgrade "$1"
@ -267,6 +267,8 @@ platform_do_upgrade() {
platform_copy_config() { platform_copy_config() {
case "$(board_name)" in case "$(board_name)" in
prpl,haze|\
qnap,301w|\
spectrum,sax1v1k|\ spectrum,sax1v1k|\
zyxel,nbg7815) zyxel,nbg7815)
emmc_copy_config emmc_copy_config