ath79: CPE220V3 Fix

Remove Duplicate entry and fix remaining entry in the firmware file
This commit is contained in:
apcameron 2020-06-06 14:35:35 -05:00 committed by Joe AE6XE
parent 79f3b518d0
commit d06bbaac2a
3 changed files with 17 additions and 52 deletions

View File

@ -171,55 +171,3 @@ Index: openwrt/target/linux/ar71xx/image/generic-tp-link.mk
define Device/wbs210-v1 define Device/wbs210-v1
$(Device/cpe510-520-v1) $(Device/cpe510-520-v1)
DEVICE_TITLE := TP-LINK WBS210 v1 DEVICE_TITLE := TP-LINK WBS210 v1
Index: openwrt/tools/firmware-utils/src/tplink-safeloader.c
===================================================================
--- openwrt.orig/tools/firmware-utils/src/tplink-safeloader.c
+++ openwrt/tools/firmware-utils/src/tplink-safeloader.c
@@ -313,6 +313,47 @@ static struct device_info boards[] = {
.last_sysupgrade_partition = "support-list",
},
+ /** Firmware layout for the CPE220 V3 */
+ {
+ .id = "CPE220V3",
+ .vendor = "CPE220(TP-LINK|UN|N300-2|00000000):3.0\r\n",
+ .support_list =
+ "SupportList:\r\n"
+ "CPE220(TP-LINK|EU|N300-2|00000000):3.0\r\n"
+ "CPE220(TP-LINK|EU|N300-2|45550000):3.0\r\n"
+ "CPE220(TP-LINK|EU|N300-2|55530000):3.0\r\n"
+ "CPE220(TP-LINK|UN|N300-2|00000000):3.0\r\n"
+ "CPE220(TP-LINK|UN|N300-2|45550000):3.0\r\n"
+ "CPE220(TP-LINK|UN|N300-2|55530000):3.0\r\n"
+ "CPE220(TP-LINK|US|N300-2|55530000):3.0\r\n"
+ "CPE220(TP-LINK|UN|N300-2):3.0\r\n"
+ "CPE220(TP-LINK|EU|N300-2):3.0\r\n"
+ "CPE220(TP-LINK|US|N300-2):3.0\r\n",
+ .support_trail = '\xff',
+ .soft_ver = NULL,
+
+ .partitions = {
+ {"fs-uboot", 0x00000, 0x20000},
+ {"partition-table", 0x20000, 0x02000},
+ {"default-mac", 0x30000, 0x00020},
+ {"product-info", 0x31100, 0x00100},
+ {"device-info", 0x31400, 0x00400},
+ {"signature", 0x32000, 0x00400},
+ {"device-id", 0x33000, 0x00100},
+ {"firmware", 0x40000, 0x770000},
+ {"soft-version", 0x7b0000, 0x00100},
+ {"support-list", 0x7b1000, 0x01000},
+ {"user-config", 0x7c0000, 0x10000},
+ {"default-config", 0x7d0000, 0x10000},
+ {"log", 0x7e0000, 0x10000},
+ {"radio", 0x7f0000, 0x10000},
+ {NULL, 0, 0}
+ },
+
+ .first_sysupgrade_partition = "os-image",
+ .last_sysupgrade_partition = "support-list",
+ },
+
/** Firmware layout for the CPE510/520 V1 */
{
.id = "CPE510",

View File

@ -0,0 +1,16 @@
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -312,10 +312,10 @@ static struct device_info boards[] = {
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
- {"os-image", 0x40000, 0x200000},
- {"file-system", 0x240000, 0x570000},
+ {"device-id", 0x33000, 0x00100},
+ {"firmware", 0x40000, 0x770000},
{"soft-version", 0x7b0000, 0x00100},
- {"support-list", 0x7b1000, 0x00400},
+ {"support-list", 0x7b1000, 0x01000},
{"user-config", 0x7c0000, 0x10000},
{"default-config", 0x7d0000, 0x10000},
{"log", 0x7e0000, 0x10000},

View File

@ -15,6 +15,7 @@
001-add_support_for_TP-Link_ATH79_WBS510_v1.patch 001-add_support_for_TP-Link_ATH79_WBS510_v1.patch
001-add_support_for_TP-Link_ATH79_WBS510_v2.patch 001-add_support_for_TP-Link_ATH79_WBS510_v2.patch
001-ath79-cpe220v3-sysupgrade-supported.patch 001-ath79-cpe220v3-sysupgrade-supported.patch
001_cpe220v3_bugfix.patch
004-add-lhg-5hpnd-xl.patch 004-add-lhg-5hpnd-xl.patch
004-add-ldf-5nd.patch 004-add-ldf-5nd.patch
005-add-haplite-new-model.patch 005-add-haplite-new-model.patch