40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
Date: Wed, 6 Jun 2018 00:35:17 +0200
|
||
|
|
Subject: 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 <mschiffer@universe-factory.net>
|
||
|
|
|
||
|
|
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
|
||
|
|
index 18e2c73737f477f4d00020893878cbdfb81a735b..709b1558a5f8487c50e922ec4d27b643f080cbcc 100644
|
||
|
|
--- a/target/linux/ar71xx/image/tp-link.mk
|
||
|
|
+++ b/target/linux/ar71xx/image/tp-link.mk
|
||
|
|
@@ -173,7 +173,10 @@ define Device/cpe510-520
|
||
|
|
TPLINK_BOARD_NAME := 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
|