From d5a38725f84f52618a7c4cb17e8bfac40a17854a Mon Sep 17 00:00:00 2001 From: Andrew Cameron Date: Sat, 29 Jun 2019 21:45:09 -0500 Subject: [PATCH] ath79: increase kernel partition size for CPE610v1 Increase the Kernel partition to address the issue discussed here https://forum.openwrt.org/t/cpe610-v1-sysupgrade-bin-missing-too-big/39637/5 Switch Back to the okli Loader to support increased partition size Signed-off-by: Andrew Cameron Signed-off-by: Christian Lamparter [add <> for e-mail] --- target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts | 6 +++--- target/linux/ath79/image/generic-tp-link.mk | 5 ++++- tools/firmware-utils/src/tplink-safeloader.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts index 5b7c32c6b7..8a78dc4fa4 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts @@ -94,12 +94,12 @@ partition@0 { label = "kernel"; - reg = <0x000000 0x1c0000>; + reg = <0x000000 0x200000>; }; - partition@1c0000 { + partition@200000 { label = "rootfs"; - reg = <0x1c0000 0x5c0000>; + reg = <0x200000 0x580000>; }; }; diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index ec250a5404..f0d0a5cd07 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -167,7 +167,10 @@ define Device/tplink_cpe610-v1 DEVICE_VARIANT := v1 TPLINK_BOARD_ID := CPE610V1 LOADER_TYPE := elf - KERNEL := kernel-bin | append-dtb | lzma | loader-kernel + LOADER_FLASH_OFFS := 0x43000 + COMPILE := loader-$(1).elf + COMPILE/loader-$(1).elf := loader-okli-compile + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 12288 endef TARGET_DEVICES += tplink_cpe610-v1 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 1a54e92b07..78d80ac89e 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -303,8 +303,8 @@ static struct device_info boards[] = { {"default-mac", 0x30000, 0x00020}, {"product-info", 0x31100, 0x00100}, {"signature", 0x32000, 0x00400}, - {"os-image", 0x40000, 0x1c0000}, - {"file-system", 0x200000, 0x5b0000}, + {"os-image", 0x40000, 0x200000}, + {"file-system", 0x240000, 0x570000}, {"soft-version", 0x7b0000, 0x00100}, {"support-list", 0x7b1000, 0x00400}, {"user-config", 0x7c0000, 0x10000}, -- 2.30.2