From: Matthias Schiffer Date: Tue, 5 Jun 2018 22:35:17 +0000 (+0200) Subject: ar71xx: switch CPE/WBS 210/510 to okli-loader X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=805e59cdcc2b6b2bb3f7583d8ccdb932e6cdeb7b;p=librecmc%2Flibrecmc.git ar71xx: switch CPE/WBS 210/510 to okli-loader We recently increased the kernel partition size of the CPE/WBS 210/510. This works fine for new installations of the factory image, but on sysupgrades, the partition table read by the bootloader is not adjusted. This limits the maximum size of the kernel loaded by the bootloader to the old partition size. While adjusting the partition table would be a cleanest solution, such a migration would have to happen before an upgrade to a new version with a newer kernel. This is error-prone and would require a two-step upgrade, as we mark the partition table partition read-only. Instead, switch from the lzma-loader with embedded kernel to the okli-loader, so only the tiny lzma-loader is loaded by the bootloader as "kernel", and the lzma-loader will then load the rest of the kernel by itself. Fixes: e39847ea2f70 ("ar71xx: increase kernel partition size for CPE/WBS 210/510") Signed-off-by: Matthias Schiffer --- diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk index b3b5fdf190..429540a52c 100644 --- a/target/linux/ar71xx/image/generic-tp-link.mk +++ b/target/linux/ar71xx/image/generic-tp-link.mk @@ -150,7 +150,10 @@ define Device/cpe510-520-v1 TPLINK_BOARD_ID := CPE510 DEVICE_PROFILE := CPE510 LOADER_TYPE := elf - KERNEL := kernel-bin | patch-cmdline | lzma | loader-kernel + LOADER_FLASH_OFFS := 0x43000 + COMPILE := loader-$(1).elf + COMPILE/loader-$(1).elf := loader-okli-compile + KERNEL := kernel-bin | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 12288 IMAGES := sysupgrade.bin factory.bin IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade IMAGE/factory.bin := append-rootfs | tplink-safeloader factory