aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucian Cristian <lucian.cristian@gmail.com>2018-06-26 20:43:28 +0300
committerMathias Kresin <dev@kresin.me>2018-06-27 08:42:54 +0200
commit4ec9763ee93243464af9943f360e945e7ce9faed (patch)
tree2c48f4d913bbed047efc060a394aca08ab90e56e
parent52a9edb1bfaf51c250a33303beacba95dd1dbc05 (diff)
downloadupstream-4ec9763ee93243464af9943f360e945e7ce9faed.tar.gz
upstream-4ec9763ee93243464af9943f360e945e7ce9faed.tar.bz2
upstream-4ec9763ee93243464af9943f360e945e7ce9faed.zip
firmware-utils: tplink-safeloader: switch tl-wr1043nd-v4 to dynamic partitions
Use the new dynamic partition split in tplink-safeloader so we no longer have to worry about kernel size increases. Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
-rw-r--r--target/linux/ar71xx/image/generic-tp-link.mk4
-rw-r--r--target/linux/ath79/image/generic-tp-link.mk2
-rw-r--r--tools/firmware-utils/src/tplink-safeloader.c9
3 files changed, 5 insertions, 10 deletions
diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk
index 502c88b1ba..d78abfbba7 100644
--- a/target/linux/ar71xx/image/generic-tp-link.mk
+++ b/target/linux/ar71xx/image/generic-tp-link.mk
@@ -401,10 +401,10 @@ define Device/tl-wr1043nd-v4
BOARDNAME := TL-WR1043ND-v4
DEVICE_PROFILE := TLWR1043
TPLINK_HWID := 0x10430004
- MTDPARTS := spi0.0:128k(u-boot)ro,1536k(kernel),14016k(rootfs),128k(product-info)ro,320k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(ART)ro,15552k@0x20000(firmware)
+ MTDPARTS := spi0.0:128k(u-boot)ro,15552k(firmware),128k(product-info)ro,320k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(ART)ro
IMAGE_SIZE := 15552k
TPLINK_BOARD_ID := TLWR1043NDV4
- KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
+ KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header -O
IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 8cfbcd3a67..f048acc673 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -69,7 +69,7 @@ define Device/tl-wr1043nd-v4
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
TPLINK_HWID := 0x10430004
TPLINK_BOARD_ID := TLWR1043NDV4
- KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header
+ KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
SUPPORTED_DEVICES := tplink,tl-wr1043nd-v4 tl-wr1043nd-v4
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 1c34406251..f1883cd636 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -860,15 +860,10 @@ static struct device_info boards[] = {
.support_trail = '\x00',
.soft_ver = NULL,
- /**
- We use a bigger os-image partition than the stock images (and thus
- smaller file-system), as our kernel doesn't fit in the stock firmware's
- 1MB os-image.
- */
+ /* We're using a dynamic kernel/rootfs split here */
.partitions = {
{"fs-uboot", 0x00000, 0x20000},
- {"os-image", 0x20000, 0x200000},
- {"file-system", 0x220000, 0xd30000},
+ {"firmware", 0x20000, 0xf30000},
{"default-mac", 0xf50000, 0x00200},
{"pin", 0xf50200, 0x00200},
{"product-info", 0xf50400, 0x0fc00},