ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-11 15:04:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ath79: restore sysupgrade support for ja76pf2 and routerstations

Browse Source 
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>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Tomasz Maciej Nowak 2020-12-01 18:30:27 +01:00 committed by maurerr
parent 1260c17758
commit 322ba8cd73
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
View File

@ -45,11 +45,11 @@ platform_do_upgrade() {
redboot_fis_do_upgrade "$1" vmlinux_2 redboot_fis_do_upgrade "$1" vmlinux_2
;; ;;
jjplus,ja76pf2) jjplus,ja76pf2)
echo "Sysupgrade disabled due bug FS#2428" redboot_fis_do_upgrade "$1" linux
;; ;;
ubnt,routerstation|\ ubnt,routerstation|\
ubnt,routerstation-pro) ubnt,routerstation-pro)
echo "Sysupgrade disabled due bug FS#2428" redboot_fis_do_upgrade "$1" kernel
;; ;;
*) *)
default_do_upgrade "$1" default_do_upgrade "$1"

8
target/linux/ath79/image/Makefile
View File

@ -5,6 +5,14 @@ KERNEL_LOADADDR = 0x80060000
DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE 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 define Build/loader-common
rm -rf $@.src rm -rf $@.src
$(MAKE) -C lzma-loader \ $(MAKE) -C lzma-loader \

4
target/linux/ath79/image/generic-ubnt.mk
View File

@ -310,9 +310,11 @@ define Device/ubnt_routerstation_common
DEVICE_VENDOR := Ubiquiti DEVICE_VENDOR := Ubiquiti
SOC := ar7161 SOC := ar7161
IMAGE_SIZE := 16128k IMAGE_SIZE := 16128k
IMAGES := factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \
check-size 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 := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
KERNEL_INITRAMFS := kernel-bin | append-dtb KERNEL_INITRAMFS := kernel-bin | append-dtb
endef endef

4
target/linux/ath79/image/generic.mk
View File

@ -1144,9 +1144,11 @@ define Device/jjplus_ja76pf2
DEVICE_VENDOR := jjPlus DEVICE_VENDOR := jjPlus
DEVICE_MODEL := JA76PF2 DEVICE_MODEL := JA76PF2
DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-basic-wolfssl -uboot-envtools fconfig 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/kernel.bin := append-kernel
IMAGE/rootfs.bin := append-rootfs | pad-rootfs 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 := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)
KERNEL_INITRAMFS := kernel-bin | append-dtb KERNEL_INITRAMFS := kernel-bin | append-dtb
IMAGE_SIZE := 16000k IMAGE_SIZE := 16000k