diff options
| author | Tomasz Maciej Nowak <tmn505@gmail.com> | 2020-12-01 18:30:27 +0100 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-12-01 20:03:15 +0100 |
| commit | 760952ad022561931846b02ddfe69c21afead0fe (patch) | |
| tree | d9f9c2fbee7bfc6b97414a9e709b900c9718edcb /target | |
| parent | 474aa3237c1bac86b475c3b2955e9501353a87f5 (diff) | |
| download | upstream-760952ad022561931846b02ddfe69c21afead0fe.tar.gz upstream-760952ad022561931846b02ddfe69c21afead0fe.tar.bz2 upstream-760952ad022561931846b02ddfe69c21afead0fe.zip | |
ath79: restore sysupgrade support for ja76pf2 and routerstations
Because the bug described in FS#2428 has been fixed with bf2870c1d9e1
("kernel: fix mtd partition erase < parent_erasesize writes") these
devices can now safely do sysupgrade.
Restore sysupgrade support disabled in:
0cc87b3bacee ("ath79: image: disable sysupgrade images for routerstations
and ja76pf2")
cc5256a8bfa0 ("ath79: base-files: disable sysupgrade for routerstations
and ja76pf2")
Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
[move Build block, remove check-size argument, wrap sysupgrade line,
make commit message easier to read]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ath79/generic/base-files/lib/upgrade/platform.sh | 4 | ||||
| -rw-r--r-- | target/linux/ath79/image/Makefile | 8 | ||||
| -rw-r--r-- | target/linux/ath79/image/generic-ubnt.mk | 4 | ||||
| -rw-r--r-- | target/linux/ath79/image/generic.mk | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh index 10756abbaf..f4fca06384 100644 --- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh @@ -45,11 +45,11 @@ platform_do_upgrade() { redboot_fis_do_upgrade "$1" vmlinux_2 ;; jjplus,ja76pf2) - echo "Sysupgrade disabled due bug FS#2428" + redboot_fis_do_upgrade "$1" linux ;; ubnt,routerstation|\ ubnt,routerstation-pro) - echo "Sysupgrade disabled due bug FS#2428" + redboot_fis_do_upgrade "$1" kernel ;; *) default_do_upgrade "$1" diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index 4b4a67fd4d..9bec159cf0 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -5,6 +5,14 @@ KERNEL_LOADADDR = 0x80060000 DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE +define Build/combined-image + sh $(TOPDIR)/scripts/combined-image.sh \ + "$(IMAGE_KERNEL)" \ + "$@" \ + "$@.new" + @mv $@.new $@ +endef + define Build/loader-common rm -rf $@.src $(MAKE) -C lzma-loader \ diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 6e12c34d85..c347bd1cf1 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -310,9 +310,11 @@ define Device/ubnt_routerstation_common DEVICE_VENDOR := Ubiquiti SOC := ar7161 IMAGE_SIZE := 16128k - IMAGES := factory.bin + IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ check-size + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \ + append-metadata | check-size KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 6ac8691f19..614f9ff0b2 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1144,9 +1144,11 @@ define Device/jjplus_ja76pf2 DEVICE_VENDOR := jjPlus DEVICE_MODEL := JA76PF2 DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-wolfssl -uboot-envtools fconfig - IMAGES := kernel.bin rootfs.bin + IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-rootfs | pad-rootfs + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \ + append-metadata | check-size KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb IMAGE_SIZE := 16000k |