From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 10 Apr 2018 15:26:34 +0000 (+0200)
Subject: firmware-utils: tplink-safeloader: move CPE/WBS 210/510 version metainfo to the end
X-Git-Tag: v18.06.0-rc1~428
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=373dc11b519516682ab48bf7db501ffffced4e61;p=openwrt%2Fstaging%2Fxback.git

firmware-utils: tplink-safeloader: move CPE/WBS 210/510 version metainfo to the end

Having the metainfo between kernel and rootfs prevents us from resizing
the kernel partition as necessary.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 2e83b71c44..60f08f4a76 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -140,10 +140,10 @@ static struct device_info boards[] = {
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
-			{"os-image", 0x40000, 0x170000},
-			{"soft-version", 0x1b0000, 0x00100},
-			{"support-list", 0x1b1000, 0x00400},
-			{"file-system", 0x1c0000, 0x600000},
+			{"os-image", 0x40000, 0x180000},
+			{"file-system", 0x1c0000, 0x5f0000},
+			{"soft-version", 0x7b0000, 0x00100},
+			{"support-list", 0x7b1000, 0x00400},
 			{"user-config", 0x7c0000, 0x10000},
 			{"default-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
@@ -152,7 +152,7 @@ static struct device_info boards[] = {
 		},
 
 		.first_sysupgrade_partition = "os-image",
-		.last_sysupgrade_partition = "file-system",
+		.last_sysupgrade_partition = "support-list",
 	},
 
 	/** Firmware layout for the CPE510/520 */
@@ -178,10 +178,10 @@ static struct device_info boards[] = {
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
-			{"os-image", 0x40000, 0x170000},
-			{"soft-version", 0x1b0000, 0x00100},
-			{"support-list", 0x1b1000, 0x00400},
-			{"file-system", 0x1c0000, 0x600000},
+			{"os-image", 0x40000, 0x180000},
+			{"file-system", 0x1c0000, 0x5f0000},
+			{"soft-version", 0x7b0000, 0x00100},
+			{"support-list", 0x7b1000, 0x00400},
 			{"user-config", 0x7c0000, 0x10000},
 			{"default-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
@@ -190,7 +190,7 @@ static struct device_info boards[] = {
 		},
 
 		.first_sysupgrade_partition = "os-image",
-		.last_sysupgrade_partition = "file-system",
+		.last_sysupgrade_partition = "support-list",
 	},
 
 	{
@@ -210,10 +210,10 @@ static struct device_info boards[] = {
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
-			{"os-image", 0x40000, 0x170000},
-			{"soft-version", 0x1b0000, 0x00100},
-			{"support-list", 0x1b1000, 0x00400},
-			{"file-system", 0x1c0000, 0x600000},
+			{"os-image", 0x40000, 0x180000},
+			{"file-system", 0x1c0000, 0x5f0000},
+			{"soft-version", 0x7b0000, 0x00100},
+			{"support-list", 0x7b1000, 0x00400},
 			{"user-config", 0x7c0000, 0x10000},
 			{"default-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
@@ -222,7 +222,7 @@ static struct device_info boards[] = {
 		},
 
 		.first_sysupgrade_partition = "os-image",
-		.last_sysupgrade_partition = "file-system",
+		.last_sysupgrade_partition = "support-list",
 	},
 
 	{
@@ -242,10 +242,10 @@ static struct device_info boards[] = {
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
-			{"os-image", 0x40000, 0x170000},
-			{"soft-version", 0x1b0000, 0x00100},
-			{"support-list", 0x1b1000, 0x00400},
-			{"file-system", 0x1c0000, 0x600000},
+			{"os-image", 0x40000, 0x180000},
+			{"file-system", 0x1c0000, 0x5f0000},
+			{"soft-version", 0x7b0000, 0x00100},
+			{"support-list", 0x7b1000, 0x00400},
 			{"user-config", 0x7c0000, 0x10000},
 			{"default-config", 0x7d0000, 0x10000},
 			{"log", 0x7e0000, 0x10000},
@@ -254,7 +254,7 @@ static struct device_info boards[] = {
 		},
 
 		.first_sysupgrade_partition = "os-image",
-		.last_sysupgrade_partition = "file-system",
+		.last_sysupgrade_partition = "support-list",
 	},
 
 	/** Firmware layout for the C2600 */