ramips: tl-wr840n-v5: increase firmware partition for 4Mmtk layot

According to console log during TP-Link TL-WR840N v5 OEM firmware update
procedure 0x3e0000-0x3f0000 64kB "config" partition, which is used to store
router's configuration settings, is erased and recreated again during every
OEM firmware update procedure, thus does not contain any valuable factory data.
So it is conviniant to use this extra 64kB erase block for jffs overlay due
limited flash size on this device like it used on TP-Link's ar71xx boards.

Signed-off-by: Serg Studzinskii <serguzhg@gmail.com>

diff --git a/target/linux/ramips/dts/TL-WR840NV5.dts b/target/linux/ramips/dts/TL-WR840NV5.dts
index 340f2bbd83898fae42b63bb3a8f05a05148b2628..ecc0fedd5938d016af3b2c6c3053922844793112 100644 (file)
--- a/target/linux/ramips/dts/TL-WR840NV5.dts
+++ b/target/linux/ramips/dts/TL-WR840NV5.dts
@@ -65,13 +65,7 @@
 
                partition@20000 {
                        label = "firmware";
-                       reg = <0x20000 0x3c0000>;
-               };
-
-               partition@3e0000 {
-                       label = "config";
-                       reg = <0x3e0000 0x10000>;
-                       read-only;
+                       reg = <0x20000 0x3d0000>;
                };
 
                factory: partition@3f0000 {

diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 60864cfed3cb303446b617af6be2abda3e6d72ea..8332c7c4233d06f61fc5f3984cf2a282b8f7863c 100644 (file)
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -112,7 +112,7 @@ TARGET_DEVICES += tl-wr840n-v4
 
 define Device/tl-wr840n-v5
   DTS := TL-WR840NV5
-  IMAGE_SIZE := 3840k
+  IMAGE_SIZE := 3904k
   DEVICE_TITLE := TP-Link TL-WR840N v5
   TPLINK_FLASHLAYOUT := 4Mmtk
   TPLINK_HWID := 0x08400005

diff --git a/tools/firmware-utils/src/mktplinkfw2.c b/tools/firmware-utils/src/mktplinkfw2.c
index 3cb5ba0835ff9ca431717fcd869753a478af1e49..dead49e7af8839bac5d1dee7445cf8921208c970 100644 (file)
--- a/tools/firmware-utils/src/mktplinkfw2.c
+++ b/tools/firmware-utils/src/mktplinkfw2.c
@@ -124,7 +124,7 @@ char md5salt_boot[MD5SUM_LEN] = {
 static struct flash_layout layouts[] = {
        {
                .id             = "4Mmtk",
-               .fw_max_len     = 0x3c0000,
+               .fw_max_len     = 0x3d0000,
                .kernel_la      = 0x80000000,
                .kernel_ep      = 0x80000000,
                .rootfs_ofs     = 0x140000,