Matthias Schiffer
parent
1f08074438
commit
bee999dd90
@ -190,7 +190,7 @@ ar71xx-generic
|
||||
- TL-WR843N/ND (v1)
|
||||
- TL-WR940N (v1, v2, v3, v4)
|
||||
- TL-WR941ND (v2, v3, v4, v5, v6)
|
||||
- TL-WR1043N/ND (v1, v2, v3)
|
||||
- TL-WR1043N/ND (v1, v2, v3, v4)
|
||||
- TL-WR2543N/ND (v1)
|
||||
|
||||
* Ubiquiti
|
||||
|
||||
@ -0,0 +1,555 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Wed, 21 Dec 2016 19:22:56 +0100
|
||||
Subject: firmware-utils: backport tplink-safeloader from LEDE 05abcf518d5e2b7d6526fd7a87a88a268030694a
|
||||
|
||||
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 77a894b237281f6211dd1123ead4b5b0f2f58370..016c118787f3b5332b76f65c85930065a569d6b8 100644
|
||||
--- a/tools/firmware-utils/src/tplink-safeloader.c
|
||||
+++ b/tools/firmware-utils/src/tplink-safeloader.c
|
||||
@@ -53,6 +53,8 @@
|
||||
#define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
|
||||
|
||||
|
||||
+#define MAX_PARTITIONS 32
|
||||
+
|
||||
/** An image partition table entry */
|
||||
struct image_partition_entry {
|
||||
const char *name;
|
||||
@@ -67,6 +69,16 @@ struct flash_partition_entry {
|
||||
uint32_t size;
|
||||
};
|
||||
|
||||
+/** Firmware layout description */
|
||||
+struct device_info {
|
||||
+ const char *id;
|
||||
+ const char *vendor;
|
||||
+ const char *support_list;
|
||||
+ char support_trail;
|
||||
+ const struct flash_partition_entry partitions[MAX_PARTITIONS+1];
|
||||
+ const char *first_sysupgrade_partition;
|
||||
+ const char *last_sysupgrade_partition;
|
||||
+};
|
||||
|
||||
/** The content of the soft-version structure */
|
||||
struct __attribute__((__packed__)) soft_version {
|
||||
@@ -102,45 +114,225 @@ static const uint8_t md5_salt[16] = {
|
||||
};
|
||||
|
||||
|
||||
-/** Vendor information for CPE210/220/510/520 */
|
||||
-static const char cpe510_vendor[] = "CPE510(TP-LINK|UN|N300-5):1.0\r\n";
|
||||
-
|
||||
-
|
||||
-/**
|
||||
- The flash partition table for CPE210/220/510/520;
|
||||
- it is the same as the one used by the stock images.
|
||||
-*/
|
||||
-static const struct flash_partition_entry cpe510_partitions[] = {
|
||||
- {"fs-uboot", 0x00000, 0x20000},
|
||||
- {"partition-table", 0x20000, 0x02000},
|
||||
- {"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},
|
||||
- {"user-config", 0x7c0000, 0x10000},
|
||||
- {"default-config", 0x7d0000, 0x10000},
|
||||
- {"log", 0x7e0000, 0x10000},
|
||||
- {"radio", 0x7f0000, 0x10000},
|
||||
- {NULL, 0, 0}
|
||||
+/** Firmware layout table */
|
||||
+static struct device_info boards[] = {
|
||||
+ /** Firmware layout for the CPE210/220 */
|
||||
+ {
|
||||
+ .id = "CPE210",
|
||||
+ .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
|
||||
+ .support_list =
|
||||
+ "SupportList:\r\n"
|
||||
+ "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
+ "CPE210(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
+ "CPE210(TP-LINK|US|N300-2):1.1\r\n"
|
||||
+ "CPE210(TP-LINK|EU|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|US|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|EU|N300-2):1.1\r\n",
|
||||
+ .support_trail = '\xff',
|
||||
+
|
||||
+ .partitions = {
|
||||
+ {"fs-uboot", 0x00000, 0x20000},
|
||||
+ {"partition-table", 0x20000, 0x02000},
|
||||
+ {"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},
|
||||
+ {"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 = "file-system",
|
||||
+ },
|
||||
+
|
||||
+ /** Firmware layout for the CPE510/520 */
|
||||
+ {
|
||||
+ .id = "CPE510",
|
||||
+ .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
|
||||
+ .support_list =
|
||||
+ "SupportList:\r\n"
|
||||
+ "CPE510(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
+ "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
+ "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
+ "CPE510(TP-LINK|US|N300-5):1.1\r\n"
|
||||
+ "CPE510(TP-LINK|EU|N300-5):1.1\r\n"
|
||||
+ "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
+ "CPE520(TP-LINK|US|N300-5):1.1\r\n"
|
||||
+ "CPE520(TP-LINK|EU|N300-5):1.1\r\n",
|
||||
+ .support_trail = '\xff',
|
||||
+
|
||||
+ .partitions = {
|
||||
+ {"fs-uboot", 0x00000, 0x20000},
|
||||
+ {"partition-table", 0x20000, 0x02000},
|
||||
+ {"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},
|
||||
+ {"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 = "file-system",
|
||||
+ },
|
||||
+
|
||||
+ /** Firmware layout for the C2600 */
|
||||
+ {
|
||||
+ .id = "C2600",
|
||||
+ .vendor = "",
|
||||
+ .support_list =
|
||||
+ "SupportList:\r\n"
|
||||
+ "{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
|
||||
+ .support_trail = '\x00',
|
||||
+
|
||||
+ .partitions = {
|
||||
+ {"SBL1", 0x00000, 0x20000},
|
||||
+ {"MIBIB", 0x20000, 0x20000},
|
||||
+ {"SBL2", 0x40000, 0x20000},
|
||||
+ {"SBL3", 0x60000, 0x30000},
|
||||
+ {"DDRCONFIG", 0x90000, 0x10000},
|
||||
+ {"SSD", 0xa0000, 0x10000},
|
||||
+ {"TZ", 0xb0000, 0x30000},
|
||||
+ {"RPM", 0xe0000, 0x20000},
|
||||
+ {"fs-uboot", 0x100000, 0x70000},
|
||||
+ {"uboot-env", 0x170000, 0x40000},
|
||||
+ {"radio", 0x1b0000, 0x40000},
|
||||
+ {"os-image", 0x1f0000, 0x200000},
|
||||
+ {"file-system", 0x3f0000, 0x1b00000},
|
||||
+ {"default-mac", 0x1ef0000, 0x00200},
|
||||
+ {"pin", 0x1ef0200, 0x00200},
|
||||
+ {"product-info", 0x1ef0400, 0x0fc00},
|
||||
+ {"partition-table", 0x1f00000, 0x10000},
|
||||
+ {"soft-version", 0x1f10000, 0x10000},
|
||||
+ {"support-list", 0x1f20000, 0x10000},
|
||||
+ {"profile", 0x1f30000, 0x10000},
|
||||
+ {"default-config", 0x1f40000, 0x10000},
|
||||
+ {"user-config", 0x1f50000, 0x40000},
|
||||
+ {"qos-db", 0x1f90000, 0x40000},
|
||||
+ {"usb-config", 0x1fd0000, 0x10000},
|
||||
+ {"log", 0x1fe0000, 0x20000},
|
||||
+ {NULL, 0, 0}
|
||||
+ },
|
||||
+
|
||||
+ .first_sysupgrade_partition = "os-image",
|
||||
+ .last_sysupgrade_partition = "file-system"
|
||||
+ },
|
||||
+
|
||||
+ /** Firmware layout for the C9 */
|
||||
+ {
|
||||
+ .id = "ARCHERC9",
|
||||
+ .vendor = "",
|
||||
+ .support_list =
|
||||
+ "SupportList:\n"
|
||||
+ "{product_name:ArcherC9,"
|
||||
+ "product_ver:1.0.0,"
|
||||
+ "special_id:00000000}\n",
|
||||
+ .support_trail = '\x00',
|
||||
+
|
||||
+ .partitions = {
|
||||
+ {"fs-uboot", 0x00000, 0x40000},
|
||||
+ {"os-image", 0x40000, 0x200000},
|
||||
+ {"file-system", 0x240000, 0xc00000},
|
||||
+ {"default-mac", 0xe40000, 0x00200},
|
||||
+ {"pin", 0xe40200, 0x00200},
|
||||
+ {"product-info", 0xe40400, 0x00200},
|
||||
+ {"partition-table", 0xe50000, 0x10000},
|
||||
+ {"soft-version", 0xe60000, 0x00200},
|
||||
+ {"support-list", 0xe61000, 0x0f000},
|
||||
+ {"profile", 0xe70000, 0x10000},
|
||||
+ {"default-config", 0xe80000, 0x10000},
|
||||
+ {"user-config", 0xe90000, 0x50000},
|
||||
+ {"log", 0xee0000, 0x100000},
|
||||
+ {"radio_bk", 0xfe0000, 0x10000},
|
||||
+ {"radio", 0xff0000, 0x10000},
|
||||
+ {NULL, 0, 0}
|
||||
+ },
|
||||
+
|
||||
+ .first_sysupgrade_partition = "os-image",
|
||||
+ .last_sysupgrade_partition = "file-system"
|
||||
+ },
|
||||
+
|
||||
+ /** Firmware layout for the EAP120 */
|
||||
+ {
|
||||
+ .id = "EAP120",
|
||||
+ .vendor = "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
|
||||
+ .support_list =
|
||||
+ "SupportList:\r\n"
|
||||
+ "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
|
||||
+ .support_trail = '\xff',
|
||||
+
|
||||
+ .partitions = {
|
||||
+ {"fs-uboot", 0x00000, 0x20000},
|
||||
+ {"partition-table", 0x20000, 0x02000},
|
||||
+ {"default-mac", 0x30000, 0x00020},
|
||||
+ {"support-list", 0x31000, 0x00100},
|
||||
+ {"product-info", 0x31100, 0x00100},
|
||||
+ {"soft-version", 0x32000, 0x00100},
|
||||
+ {"os-image", 0x40000, 0x180000},
|
||||
+ {"file-system", 0x1c0000, 0x600000},
|
||||
+ {"user-config", 0x7c0000, 0x10000},
|
||||
+ {"backup-config", 0x7d0000, 0x10000},
|
||||
+ {"log", 0x7e0000, 0x10000},
|
||||
+ {"radio", 0x7f0000, 0x10000},
|
||||
+ {NULL, 0, 0}
|
||||
+ },
|
||||
+
|
||||
+ .first_sysupgrade_partition = "os-image",
|
||||
+ .last_sysupgrade_partition = "file-system"
|
||||
+ },
|
||||
+
|
||||
+ /** Firmware layout for the TL-WR1043 v4 */
|
||||
+ {
|
||||
+ .id = "TLWR1043NDV4",
|
||||
+ .vendor = "",
|
||||
+ .support_list =
|
||||
+ "SupportList:\n"
|
||||
+ "{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
|
||||
+ .support_trail = '\x00',
|
||||
+
|
||||
+ /**
|
||||
+ 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.
|
||||
+ */
|
||||
+ .partitions = {
|
||||
+ {"fs-uboot", 0x00000, 0x20000},
|
||||
+ {"os-image", 0x20000, 0x180000},
|
||||
+ {"file-system", 0x1a0000, 0xdb0000},
|
||||
+ {"default-mac", 0xf50000, 0x00200},
|
||||
+ {"pin", 0xf50200, 0x00200},
|
||||
+ {"product-info", 0xf50400, 0x0fc00},
|
||||
+ {"soft-version", 0xf60000, 0x0b000},
|
||||
+ {"support-list", 0xf6b000, 0x04000},
|
||||
+ {"profile", 0xf70000, 0x04000},
|
||||
+ {"default-config", 0xf74000, 0x0b000},
|
||||
+ {"user-config", 0xf80000, 0x40000},
|
||||
+ {"partition-table", 0xfc0000, 0x10000},
|
||||
+ {"log", 0xfd0000, 0x20000},
|
||||
+ {"radio", 0xff0000, 0x10000},
|
||||
+ {NULL, 0, 0}
|
||||
+ },
|
||||
+
|
||||
+ .first_sysupgrade_partition = "os-image",
|
||||
+ .last_sysupgrade_partition = "file-system"
|
||||
+ },
|
||||
+
|
||||
+ {}
|
||||
};
|
||||
|
||||
-/**
|
||||
- The support list for CPE210/220/510/520
|
||||
-*/
|
||||
-static const char cpe510_support_list[] =
|
||||
- "SupportList:\r\n"
|
||||
- "CPE510(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
- "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
- "CPE520(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
- "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
- "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
- "CPE210(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
- "CPE220(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
- "CPE220(TP-LINK|UN|N300-2):1.1\r\n";
|
||||
-
|
||||
#define error(_ret, _errno, _str, ...) \
|
||||
do { \
|
||||
fprintf(stderr, _str ": %s\n", ## __VA_ARGS__, \
|
||||
@@ -240,14 +432,14 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
|
||||
}
|
||||
|
||||
/** Generates the support-list partition */
|
||||
-static struct image_partition_entry make_support_list(const char *support_list) {
|
||||
- size_t len = strlen(support_list);
|
||||
+static struct image_partition_entry make_support_list(const struct device_info *info) {
|
||||
+ size_t len = strlen(info->support_list);
|
||||
struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
|
||||
|
||||
put32(entry.data, len);
|
||||
memset(entry.data+4, 0, 4);
|
||||
- memcpy(entry.data+8, support_list, len);
|
||||
- entry.data[len+8] = '\xff';
|
||||
+ memcpy(entry.data+8, info->support_list, len);
|
||||
+ entry.data[len+8] = info->support_trail;
|
||||
|
||||
return entry;
|
||||
}
|
||||
@@ -313,12 +505,22 @@ static struct image_partition_entry read_file(const char *part_name, const char
|
||||
|
||||
I think partition-table must be the first partition in the firmware image.
|
||||
*/
|
||||
-static void put_partitions(uint8_t *buffer, const struct image_partition_entry *parts) {
|
||||
- size_t i;
|
||||
+static void put_partitions(uint8_t *buffer, const struct flash_partition_entry *flash_parts, const struct image_partition_entry *parts) {
|
||||
+ size_t i, j;
|
||||
char *image_pt = (char *)buffer, *end = image_pt + 0x800;
|
||||
|
||||
size_t base = 0x800;
|
||||
for (i = 0; parts[i].name; i++) {
|
||||
+ for (j = 0; flash_parts[j].name; j++) {
|
||||
+ if (!strcmp(flash_parts[j].name, parts[i].name)) {
|
||||
+ if (parts[i].size > flash_parts[j].size)
|
||||
+ error(1, 0, "%s partition too big (more than %u bytes)", flash_parts[j].name, (unsigned)flash_parts[j].size);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ assert(flash_parts[j].name);
|
||||
+
|
||||
memcpy(buffer + base, parts[i].data, parts[i].size);
|
||||
|
||||
size_t len = end-image_pt;
|
||||
@@ -331,10 +533,6 @@ static void put_partitions(uint8_t *buffer, const struct image_partition_entry *
|
||||
|
||||
base += parts[i].size;
|
||||
}
|
||||
-
|
||||
- image_pt++;
|
||||
-
|
||||
- memset(image_pt, 0xff, end-image_pt);
|
||||
}
|
||||
|
||||
/** Generates and writes the image MD5 checksum */
|
||||
@@ -363,7 +561,7 @@ static void put_md5(uint8_t *md5, uint8_t *buffer, unsigned int len) {
|
||||
1014-1813 Image partition table (2048 bytes, padded with 0xff)
|
||||
1814-xxxx Firmware partitions
|
||||
*/
|
||||
-static void * generate_factory_image(const char *vendor, const struct image_partition_entry *parts, size_t *len) {
|
||||
+static void * generate_factory_image(const struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
|
||||
*len = 0x1814;
|
||||
|
||||
size_t i;
|
||||
@@ -374,14 +572,16 @@ static void * generate_factory_image(const char *vendor, const struct image_part
|
||||
if (!image)
|
||||
error(1, errno, "malloc");
|
||||
|
||||
+ memset(image, 0xff, *len);
|
||||
put32(image, *len);
|
||||
|
||||
- size_t vendor_len = strlen(vendor);
|
||||
- put32(image+0x14, vendor_len);
|
||||
- memcpy(image+0x18, vendor, vendor_len);
|
||||
- memset(image+0x18+vendor_len, 0xff, 4092-vendor_len);
|
||||
+ if (info->vendor) {
|
||||
+ size_t vendor_len = strlen(info->vendor);
|
||||
+ put32(image+0x14, vendor_len);
|
||||
+ memcpy(image+0x18, info->vendor, vendor_len);
|
||||
+ }
|
||||
|
||||
- put_partitions(image + 0x1014, parts);
|
||||
+ put_partitions(image + 0x1014, info->partitions, parts);
|
||||
put_md5(image+0x04, image+0x14, *len-0x14);
|
||||
|
||||
return image;
|
||||
@@ -394,33 +594,39 @@ static void * generate_factory_image(const char *vendor, const struct image_part
|
||||
should be generalized when TP-LINK starts building its safeloader into hardware with
|
||||
different flash layouts.
|
||||
*/
|
||||
-static void * generate_sysupgrade_image(const struct flash_partition_entry *flash_parts, const struct image_partition_entry *image_parts, size_t *len) {
|
||||
- const struct flash_partition_entry *flash_os_image = &flash_parts[5];
|
||||
- const struct flash_partition_entry *flash_soft_version = &flash_parts[6];
|
||||
- const struct flash_partition_entry *flash_support_list = &flash_parts[7];
|
||||
- const struct flash_partition_entry *flash_file_system = &flash_parts[8];
|
||||
-
|
||||
- const struct image_partition_entry *image_os_image = &image_parts[3];
|
||||
- const struct image_partition_entry *image_soft_version = &image_parts[1];
|
||||
- const struct image_partition_entry *image_support_list = &image_parts[2];
|
||||
- const struct image_partition_entry *image_file_system = &image_parts[4];
|
||||
-
|
||||
- assert(strcmp(flash_os_image->name, "os-image") == 0);
|
||||
- assert(strcmp(flash_soft_version->name, "soft-version") == 0);
|
||||
- assert(strcmp(flash_support_list->name, "support-list") == 0);
|
||||
- assert(strcmp(flash_file_system->name, "file-system") == 0);
|
||||
-
|
||||
- assert(strcmp(image_os_image->name, "os-image") == 0);
|
||||
- assert(strcmp(image_soft_version->name, "soft-version") == 0);
|
||||
- assert(strcmp(image_support_list->name, "support-list") == 0);
|
||||
- assert(strcmp(image_file_system->name, "file-system") == 0);
|
||||
-
|
||||
- if (image_os_image->size > flash_os_image->size)
|
||||
- error(1, 0, "kernel image too big (more than %u bytes)", (unsigned)flash_os_image->size);
|
||||
- if (image_file_system->size > flash_file_system->size)
|
||||
- error(1, 0, "rootfs image too big (more than %u bytes)", (unsigned)flash_file_system->size);
|
||||
-
|
||||
- *len = flash_file_system->base - flash_os_image->base + image_file_system->size;
|
||||
+static void * generate_sysupgrade_image(const struct device_info *info, const struct image_partition_entry *image_parts, size_t *len) {
|
||||
+ size_t i, j;
|
||||
+ size_t flash_first_partition_index = 0;
|
||||
+ size_t flash_last_partition_index = 0;
|
||||
+ const struct flash_partition_entry *flash_first_partition = NULL;
|
||||
+ const struct flash_partition_entry *flash_last_partition = NULL;
|
||||
+ const struct image_partition_entry *image_last_partition = NULL;
|
||||
+
|
||||
+ /** Find first and last partitions */
|
||||
+ for (i = 0; info->partitions[i].name; i++) {
|
||||
+ if (!strcmp(info->partitions[i].name, info->first_sysupgrade_partition)) {
|
||||
+ flash_first_partition = &info->partitions[i];
|
||||
+ flash_first_partition_index = i;
|
||||
+ } else if (!strcmp(info->partitions[i].name, info->last_sysupgrade_partition)) {
|
||||
+ flash_last_partition = &info->partitions[i];
|
||||
+ flash_last_partition_index = i;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ assert(flash_first_partition && flash_last_partition);
|
||||
+ assert(flash_first_partition_index < flash_last_partition_index);
|
||||
+
|
||||
+ /** Find last partition from image to calculate needed size */
|
||||
+ for (i = 0; image_parts[i].name; i++) {
|
||||
+ if (!strcmp(image_parts[i].name, info->last_sysupgrade_partition)) {
|
||||
+ image_last_partition = &image_parts[i];
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ assert(image_last_partition);
|
||||
+
|
||||
+ *len = flash_last_partition->base - flash_first_partition->base + image_last_partition->size;
|
||||
|
||||
uint8_t *image = malloc(*len);
|
||||
if (!image)
|
||||
@@ -428,31 +634,44 @@ static void * generate_sysupgrade_image(const struct flash_partition_entry *flas
|
||||
|
||||
memset(image, 0xff, *len);
|
||||
|
||||
- memcpy(image, image_os_image->data, image_os_image->size);
|
||||
- memcpy(image + flash_soft_version->base - flash_os_image->base, image_soft_version->data, image_soft_version->size);
|
||||
- memcpy(image + flash_support_list->base - flash_os_image->base, image_support_list->data, image_support_list->size);
|
||||
- memcpy(image + flash_file_system->base - flash_os_image->base, image_file_system->data, image_file_system->size);
|
||||
+ for (i = flash_first_partition_index; i <= flash_last_partition_index; i++) {
|
||||
+ for (j = 0; image_parts[j].name; j++) {
|
||||
+ if (!strcmp(info->partitions[i].name, image_parts[j].name)) {
|
||||
+ if (image_parts[j].size > info->partitions[i].size)
|
||||
+ error(1, 0, "%s partition too big (more than %u bytes)", info->partitions[i].name, (unsigned)info->partitions[i].size);
|
||||
+ memcpy(image + info->partitions[i].base - flash_first_partition->base, image_parts[j].data, image_parts[j].size);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ assert(image_parts[j].name);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
return image;
|
||||
}
|
||||
|
||||
-
|
||||
-/** Generates an image for CPE210/220/510/520 and writes it to a file */
|
||||
-static void do_cpe510(const char *output, const char *kernel_image, const char *rootfs_image, uint32_t rev, bool add_jffs2_eof, bool sysupgrade) {
|
||||
+/** Generates an image according to a given layout and writes it to a file */
|
||||
+static void build_image(const char *output,
|
||||
+ const char *kernel_image,
|
||||
+ const char *rootfs_image,
|
||||
+ uint32_t rev,
|
||||
+ bool add_jffs2_eof,
|
||||
+ bool sysupgrade,
|
||||
+ const struct device_info *info) {
|
||||
struct image_partition_entry parts[6] = {};
|
||||
|
||||
- parts[0] = make_partition_table(cpe510_partitions);
|
||||
+ parts[0] = make_partition_table(info->partitions);
|
||||
parts[1] = make_soft_version(rev);
|
||||
- parts[2] = make_support_list(cpe510_support_list);
|
||||
+ parts[2] = make_support_list(info);
|
||||
parts[3] = read_file("os-image", kernel_image, false);
|
||||
parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
|
||||
|
||||
size_t len;
|
||||
void *image;
|
||||
if (sysupgrade)
|
||||
- image = generate_sysupgrade_image(cpe510_partitions, parts, &len);
|
||||
+ image = generate_sysupgrade_image(info, parts, &len);
|
||||
else
|
||||
- image = generate_factory_image(cpe510_vendor, parts, &len);
|
||||
+ image = generate_factory_image(info, parts, &len);
|
||||
|
||||
FILE *file = fopen(output, "wb");
|
||||
if (!file)
|
||||
@@ -470,7 +689,6 @@ static void do_cpe510(const char *output, const char *kernel_image, const char *
|
||||
free_image_partition(parts[i]);
|
||||
}
|
||||
|
||||
-
|
||||
/** Usage output */
|
||||
static void usage(const char *argv0) {
|
||||
fprintf(stderr,
|
||||
@@ -490,10 +708,22 @@ static void usage(const char *argv0) {
|
||||
};
|
||||
|
||||
|
||||
+static const struct device_info *find_board(const char *id)
|
||||
+{
|
||||
+ struct device_info *board = NULL;
|
||||
+
|
||||
+ for (board = boards; board->id != NULL; board++)
|
||||
+ if (strcasecmp(id, board->id) == 0)
|
||||
+ return board;
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
int main(int argc, char *argv[]) {
|
||||
const char *board = NULL, *kernel_image = NULL, *rootfs_image = NULL, *output = NULL;
|
||||
bool add_jffs2_eof = false, sysupgrade = false;
|
||||
unsigned rev = 0;
|
||||
+ const struct device_info *info;
|
||||
|
||||
while (true) {
|
||||
int c;
|
||||
@@ -550,10 +780,12 @@ int main(int argc, char *argv[]) {
|
||||
if (!output)
|
||||
error(1, 0, "no output filename has been specified");
|
||||
|
||||
- if (strcmp(board, "CPE510") == 0)
|
||||
- do_cpe510(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
|
||||
- else
|
||||
+ info = find_board(board);
|
||||
+
|
||||
+ if (info == NULL)
|
||||
error(1, 0, "unsupported board %s", board);
|
||||
|
||||
+ build_image(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade, info);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
@ -1,188 +0,0 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Thu, 9 Jun 2016 05:02:18 +0200
|
||||
Subject: fw-utils/tplink-safeloader.c: Add support for Archer C2600
|
||||
|
||||
Signed-off-by: Ash Benz <ash.benz@bk.ru>
|
||||
|
||||
Backport of LEDE 955c341d3bec0eb4971a03924e99156367255d7b
|
||||
|
||||
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
|
||||
index 77a894b237281f6211dd1123ead4b5b0f2f58370..2e204aa2335e55515a60a1f5c08ca1b499eb9287 100644
|
||||
--- a/tools/firmware-utils/src/tplink-safeloader.c
|
||||
+++ b/tools/firmware-utils/src/tplink-safeloader.c
|
||||
@@ -105,6 +105,8 @@ static const uint8_t md5_salt[16] = {
|
||||
/** Vendor information for CPE210/220/510/520 */
|
||||
static const char cpe510_vendor[] = "CPE510(TP-LINK|UN|N300-5):1.0\r\n";
|
||||
|
||||
+/** Vendor information for C2600 */
|
||||
+static const char c2600_vendor[] = "";
|
||||
|
||||
/**
|
||||
The flash partition table for CPE210/220/510/520;
|
||||
@@ -128,6 +130,39 @@ static const struct flash_partition_entry cpe510_partitions[] = {
|
||||
};
|
||||
|
||||
/**
|
||||
+ The flash partition table for C2600;
|
||||
+ it is the same as the one used by the stock images.
|
||||
+*/
|
||||
+static const struct flash_partition_entry c2600_partitions[] = {
|
||||
+ {"SBL1", 0x00000, 0x20000},
|
||||
+ {"MIBIB", 0x20000, 0x20000},
|
||||
+ {"SBL2", 0x40000, 0x20000},
|
||||
+ {"SBL3", 0x60000, 0x30000},
|
||||
+ {"DDRCONFIG", 0x90000, 0x10000},
|
||||
+ {"SSD", 0xa0000, 0x10000},
|
||||
+ {"TZ", 0xb0000, 0x30000},
|
||||
+ {"RPM", 0xe0000, 0x20000},
|
||||
+ {"fs-uboot", 0x100000, 0x70000},
|
||||
+ {"uboot-env", 0x170000, 0x40000},
|
||||
+ {"radio", 0x1b0000, 0x40000},
|
||||
+ {"os-image", 0x1f0000, 0x200000},
|
||||
+ {"file-system", 0x3f0000, 0x1b00000},
|
||||
+ {"default-mac", 0x1ef0000, 0x00200},
|
||||
+ {"pin", 0x1ef0200, 0x00200},
|
||||
+ {"product-info", 0x1ef0400, 0x0fc00},
|
||||
+ {"partition-table", 0x1f00000, 0x10000},
|
||||
+ {"soft-version", 0x1f10000, 0x10000},
|
||||
+ {"support-list", 0x1f20000, 0x10000},
|
||||
+ {"profile", 0x1f30000, 0x10000},
|
||||
+ {"default-config", 0x1f40000, 0x10000},
|
||||
+ {"user-config", 0x1f50000, 0x40000},
|
||||
+ {"qos-db", 0x1f90000, 0x40000},
|
||||
+ {"usb-config", 0x1fd0000, 0x10000},
|
||||
+ {"log", 0x1fe0000, 0x20000},
|
||||
+ {NULL, 0, 0}
|
||||
+};
|
||||
+
|
||||
+/**
|
||||
The support list for CPE210/220/510/520
|
||||
*/
|
||||
static const char cpe510_support_list[] =
|
||||
@@ -141,6 +176,13 @@ static const char cpe510_support_list[] =
|
||||
"CPE220(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
"CPE220(TP-LINK|UN|N300-2):1.1\r\n";
|
||||
|
||||
+/**
|
||||
+ The support list for C2600
|
||||
+*/
|
||||
+static const char c2600_support_list[] =
|
||||
+ "SupportList:\r\n"
|
||||
+ "{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n";
|
||||
+
|
||||
#define error(_ret, _errno, _str, ...) \
|
||||
do { \
|
||||
fprintf(stderr, _str ": %s\n", ## __VA_ARGS__, \
|
||||
@@ -240,14 +282,14 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
|
||||
}
|
||||
|
||||
/** Generates the support-list partition */
|
||||
-static struct image_partition_entry make_support_list(const char *support_list) {
|
||||
+static struct image_partition_entry make_support_list(const char *support_list, bool trailzero) {
|
||||
size_t len = strlen(support_list);
|
||||
struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
|
||||
|
||||
put32(entry.data, len);
|
||||
memset(entry.data+4, 0, 4);
|
||||
memcpy(entry.data+8, support_list, len);
|
||||
- entry.data[len+8] = '\xff';
|
||||
+ entry.data[len+8] = trailzero ? '\x00' : '\xff';
|
||||
|
||||
return entry;
|
||||
}
|
||||
@@ -436,6 +478,37 @@ static void * generate_sysupgrade_image(const struct flash_partition_entry *flas
|
||||
return image;
|
||||
}
|
||||
|
||||
+static void * generate_sysupgrade_image_c2600(const struct flash_partition_entry *flash_parts, const struct image_partition_entry *image_parts, size_t *len) {
|
||||
+ const struct flash_partition_entry *flash_os_image = &flash_parts[11];
|
||||
+ const struct flash_partition_entry *flash_file_system = &flash_parts[12];
|
||||
+
|
||||
+ const struct image_partition_entry *image_os_image = &image_parts[3];
|
||||
+ const struct image_partition_entry *image_file_system = &image_parts[4];
|
||||
+
|
||||
+ assert(strcmp(flash_os_image->name, "os-image") == 0);
|
||||
+ assert(strcmp(flash_file_system->name, "file-system") == 0);
|
||||
+
|
||||
+ assert(strcmp(image_os_image->name, "os-image") == 0);
|
||||
+ assert(strcmp(image_file_system->name, "file-system") == 0);
|
||||
+
|
||||
+ if (image_os_image->size > flash_os_image->size)
|
||||
+ error(1, 0, "kernel image too big (more than %u bytes)", (unsigned)flash_os_image->size);
|
||||
+ if (image_file_system->size > flash_file_system->size)
|
||||
+ error(1, 0, "rootfs image too big (more than %u bytes)", (unsigned)flash_file_system->size);
|
||||
+
|
||||
+ *len = flash_file_system->base - flash_os_image->base + image_file_system->size;
|
||||
+
|
||||
+ uint8_t *image = malloc(*len);
|
||||
+ if (!image)
|
||||
+ error(1, errno, "malloc");
|
||||
+
|
||||
+ memset(image, 0xff, *len);
|
||||
+
|
||||
+ memcpy(image, image_os_image->data, image_os_image->size);
|
||||
+ memcpy(image + flash_file_system->base - flash_os_image->base, image_file_system->data, image_file_system->size);
|
||||
+
|
||||
+ return image;
|
||||
+}
|
||||
|
||||
/** Generates an image for CPE210/220/510/520 and writes it to a file */
|
||||
static void do_cpe510(const char *output, const char *kernel_image, const char *rootfs_image, uint32_t rev, bool add_jffs2_eof, bool sysupgrade) {
|
||||
@@ -443,7 +516,7 @@ static void do_cpe510(const char *output, const char *kernel_image, const char *
|
||||
|
||||
parts[0] = make_partition_table(cpe510_partitions);
|
||||
parts[1] = make_soft_version(rev);
|
||||
- parts[2] = make_support_list(cpe510_support_list);
|
||||
+ parts[2] = make_support_list(cpe510_support_list,false);
|
||||
parts[3] = read_file("os-image", kernel_image, false);
|
||||
parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
|
||||
|
||||
@@ -470,6 +543,39 @@ static void do_cpe510(const char *output, const char *kernel_image, const char *
|
||||
free_image_partition(parts[i]);
|
||||
}
|
||||
|
||||
+/** Generates an image for C2600 and writes it to a file */
|
||||
+static void do_c2600(const char *output, const char *kernel_image, const char *rootfs_image, uint32_t rev, bool add_jffs2_eof, bool sysupgrade) {
|
||||
+ struct image_partition_entry parts[6] = {};
|
||||
+
|
||||
+ parts[0] = make_partition_table(c2600_partitions);
|
||||
+ parts[1] = make_soft_version(rev);
|
||||
+ parts[2] = make_support_list(c2600_support_list,true);
|
||||
+ parts[3] = read_file("os-image", kernel_image, false);
|
||||
+ parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
|
||||
+
|
||||
+ size_t len;
|
||||
+ void *image;
|
||||
+ if (sysupgrade)
|
||||
+ image = generate_sysupgrade_image_c2600(c2600_partitions, parts, &len);
|
||||
+ else
|
||||
+ image = generate_factory_image(c2600_vendor, parts, &len);
|
||||
+
|
||||
+ FILE *file = fopen(output, "wb");
|
||||
+ if (!file)
|
||||
+ error(1, errno, "unable to open output file");
|
||||
+
|
||||
+ if (fwrite(image, len, 1, file) != 1)
|
||||
+ error(1, 0, "unable to write output file");
|
||||
+
|
||||
+ fclose(file);
|
||||
+
|
||||
+ free(image);
|
||||
+
|
||||
+ size_t i;
|
||||
+ for (i = 0; parts[i].name; i++)
|
||||
+ free_image_partition(parts[i]);
|
||||
+}
|
||||
+
|
||||
|
||||
/** Usage output */
|
||||
static void usage(const char *argv0) {
|
||||
@@ -552,6 +658,8 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
if (strcmp(board, "CPE510") == 0)
|
||||
do_cpe510(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
|
||||
+ else if (strcmp(board, "C2600") == 0)
|
||||
+ do_c2600(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
|
||||
else
|
||||
error(1, 0, "unsupported board %s", board);
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Thu, 9 Jun 2016 05:03:35 +0200
|
||||
Subject: ar71xx: split CPE210 from CPE510 profile
|
||||
|
||||
The CPE210 was still described for the OEM upgrade as compatible,
|
||||
even the wireless configuration isn't compatible anymore between
|
||||
both series (2ghz and 5ghz).
|
||||
Update the CPE210 image profile to use the new profile.
|
||||
|
||||
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
|
||||
|
||||
Backport of LEDE 824147960569f2c1cd22140c9074c62c3df911a5
|
||||
|
||||
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
|
||||
index 75083f9b698ba8a438256209a34369eb626a3b3d..bb2bb94e04ee8f59db62907ace49952061b411dc 100644
|
||||
--- a/target/linux/ar71xx/image/Makefile
|
||||
+++ b/target/linux/ar71xx/image/Makefile
|
||||
@@ -2111,7 +2111,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR10
|
||||
$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V3,tl-wr1043nd-v3,TL-WR1043ND-v2,ttyS0,115200,0x10430003,1,8M))
|
||||
$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99))
|
||||
|
||||
-$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
|
||||
+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE210))
|
||||
$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510_520,cpe510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
|
||||
|
||||
$(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x))
|
||||
@ -1,102 +0,0 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Thu, 9 Jun 2016 05:03:35 +0200
|
||||
Subject: tools/tplink-safeloader: split CPE210 from CPE510 profile
|
||||
|
||||
The CPE210 was still described for the OEM upgrade as compatible,
|
||||
even the wireless configuration isn't compatible anymore between
|
||||
both series (2ghz and 5ghz).
|
||||
Update the CPE210 image profile to use the new profile.
|
||||
|
||||
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
|
||||
|
||||
Backport of LEDE 824147960569f2c1cd22140c9074c62c3df911a5
|
||||
|
||||
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
|
||||
index 75083f9b698ba8a438256209a34369eb626a3b3d..bb2bb94e04ee8f59db62907ace49952061b411dc 100644
|
||||
--- a/target/linux/ar71xx/image/Makefile
|
||||
+++ b/target/linux/ar71xx/image/Makefile
|
||||
@@ -2111,7 +2111,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR10
|
||||
$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V3,tl-wr1043nd-v3,TL-WR1043ND-v2,ttyS0,115200,0x10430003,1,8M))
|
||||
$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99))
|
||||
|
||||
-$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
|
||||
+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE210))
|
||||
$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510_520,cpe510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
|
||||
|
||||
$(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x))
|
||||
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
|
||||
index 2e204aa2335e55515a60a1f5c08ca1b499eb9287..4938f74eecd122265072390e1c6b8cadb09844d0 100644
|
||||
--- a/tools/firmware-utils/src/tplink-safeloader.c
|
||||
+++ b/tools/firmware-utils/src/tplink-safeloader.c
|
||||
@@ -163,6 +163,15 @@ static const struct flash_partition_entry c2600_partitions[] = {
|
||||
};
|
||||
|
||||
/**
|
||||
+ The support list for CPE210/220
|
||||
+*/
|
||||
+static const char cpe210_support_list[] =
|
||||
+ "SupportList:\r\n"
|
||||
+ "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
+ "CPE210(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
+ "CPE220(TP-LINK|UN|N300-2):1.1\r\n";
|
||||
+/**
|
||||
The support list for CPE210/220/510/520
|
||||
*/
|
||||
static const char cpe510_support_list[] =
|
||||
@@ -170,11 +179,7 @@ static const char cpe510_support_list[] =
|
||||
"CPE510(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
"CPE510(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
"CPE520(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
- "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
- "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
- "CPE210(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
- "CPE220(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
- "CPE220(TP-LINK|UN|N300-2):1.1\r\n";
|
||||
+ "CPE520(TP-LINK|UN|N300-5):1.1\r\n";
|
||||
|
||||
/**
|
||||
The support list for C2600
|
||||
@@ -511,12 +516,18 @@ static void * generate_sysupgrade_image_c2600(const struct flash_partition_entry
|
||||
}
|
||||
|
||||
/** Generates an image for CPE210/220/510/520 and writes it to a file */
|
||||
-static void do_cpe510(const char *output, const char *kernel_image, const char *rootfs_image, uint32_t rev, bool add_jffs2_eof, bool sysupgrade) {
|
||||
+static void do_cpe(const char *output,
|
||||
+ const char *kernel_image,
|
||||
+ const char *rootfs_image,
|
||||
+ uint32_t rev,
|
||||
+ bool add_jffs2_eof,
|
||||
+ bool sysupgrade,
|
||||
+ const char *support_list) {
|
||||
struct image_partition_entry parts[6] = {};
|
||||
|
||||
parts[0] = make_partition_table(cpe510_partitions);
|
||||
parts[1] = make_soft_version(rev);
|
||||
- parts[2] = make_support_list(cpe510_support_list,false);
|
||||
+ parts[2] = make_support_list(support_list, false);
|
||||
parts[3] = read_file("os-image", kernel_image, false);
|
||||
parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
|
||||
|
||||
@@ -549,7 +560,7 @@ static void do_c2600(const char *output, const char *kernel_image, const char *r
|
||||
|
||||
parts[0] = make_partition_table(c2600_partitions);
|
||||
parts[1] = make_soft_version(rev);
|
||||
- parts[2] = make_support_list(c2600_support_list,true);
|
||||
+ parts[2] = make_support_list(c2600_support_list, true);
|
||||
parts[3] = read_file("os-image", kernel_image, false);
|
||||
parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
|
||||
|
||||
@@ -656,8 +667,10 @@ int main(int argc, char *argv[]) {
|
||||
if (!output)
|
||||
error(1, 0, "no output filename has been specified");
|
||||
|
||||
- if (strcmp(board, "CPE510") == 0)
|
||||
- do_cpe510(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
|
||||
+ if (strcmp(board, "CPE210") == 0)
|
||||
+ do_cpe(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade, cpe210_support_list);
|
||||
+ else if (strcmp(board, "CPE510") == 0)
|
||||
+ do_cpe(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade, cpe510_support_list);
|
||||
else if (strcmp(board, "C2600") == 0)
|
||||
do_c2600(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
|
||||
else
|
||||
@ -1,45 +0,0 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Sun, 11 Dec 2016 18:00:13 +0100
|
||||
Subject: firmware-utils: tplink-safeloader: update support list for CPE210/510/...
|
||||
|
||||
Adds support for new EU and US variants, removes a few strings that were
|
||||
never actually used and have been removed from the stock firmwares.
|
||||
|
||||
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 4938f74eecd122265072390e1c6b8cadb09844d0..4a38dff10003825a3b72595d57f0e62ef233e9bc 100644
|
||||
--- a/tools/firmware-utils/src/tplink-safeloader.c
|
||||
+++ b/tools/firmware-utils/src/tplink-safeloader.c
|
||||
@@ -169,8 +169,13 @@ static const char cpe210_support_list[] =
|
||||
"SupportList:\r\n"
|
||||
"CPE210(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
"CPE210(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
- "CPE220(TP-LINK|UN|N300-2):1.0\r\n"
|
||||
- "CPE220(TP-LINK|UN|N300-2):1.1\r\n";
|
||||
+ "CPE210(TP-LINK|US|N300-2):1.1\r\n"
|
||||
+ "CPE210(TP-LINK|EU|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|UN|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|US|N300-2):1.1\r\n"
|
||||
+ "CPE220(TP-LINK|EU|N300-2):1.1\r\n"
|
||||
+ ;
|
||||
+
|
||||
/**
|
||||
The support list for CPE210/220/510/520
|
||||
*/
|
||||
@@ -178,8 +183,13 @@ static const char cpe510_support_list[] =
|
||||
"SupportList:\r\n"
|
||||
"CPE510(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
"CPE510(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
- "CPE520(TP-LINK|UN|N300-5):1.0\r\n"
|
||||
- "CPE520(TP-LINK|UN|N300-5):1.1\r\n";
|
||||
+ "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
+ "CPE510(TP-LINK|US|N300-5):1.1\r\n"
|
||||
+ "CPE510(TP-LINK|EU|N300-5):1.1\r\n"
|
||||
+ "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
|
||||
+ "CPE520(TP-LINK|US|N300-5):1.1\r\n"
|
||||
+ "CPE520(TP-LINK|EU|N300-5):1.1\r\n"
|
||||
+ ;
|
||||
|
||||
/**
|
||||
The support list for C2600
|
||||
@ -0,0 +1,39 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Fri, 9 Dec 2016 13:08:51 +0100
|
||||
Subject: ar71xx: rename mktplinkfw-initramfs to more generic mktplinkfw-combined
|
||||
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
Backport of LEDE 0495181529e6069af03704f4b5ae71883a2cd6b6
|
||||
|
||||
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
|
||||
index b35c713f3c92c3d02f26f4bf535aeec34fd71b12..638e97f088b5420cf4f2a3c706875677815240e1 100644
|
||||
--- a/target/linux/ar71xx/image/Makefile
|
||||
+++ b/target/linux/ar71xx/image/Makefile
|
||||
@@ -63,7 +63,7 @@ define Build/mktplinkfw
|
||||
endef
|
||||
|
||||
# -c combined image
|
||||
-define Build/mktplinkfw-initramfs
|
||||
+define Build/mktplinkfw-combined
|
||||
$(STAGING_DIR_HOST)/bin/mktplinkfw \
|
||||
-H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \
|
||||
-k $@ \
|
||||
@@ -203,7 +203,7 @@ TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2
|
||||
define Device/tplink
|
||||
TPLINK_HWREV := 0x1
|
||||
KERNEL := kernel-bin | patch-cmdline | lzma
|
||||
- KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs
|
||||
+ KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-combined
|
||||
IMAGES := sysupgrade.bin factory.bin
|
||||
IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
|
||||
IMAGE/factory.bin := append-rootfs | mktplinkfw factory
|
||||
@@ -215,7 +215,7 @@ $(Device/tplink)
|
||||
COMPILE := loader-$(1).gz
|
||||
COMPILE/loader-$(1).gz := loader-okli-compile
|
||||
KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1)
|
||||
- KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel | mktplinkfw-initramfs
|
||||
+ KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel | mktplinkfw-combined
|
||||
endef
|
||||
|
||||
define Device/tplink-4m
|
||||
@ -0,0 +1,36 @@
|
||||
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
Date: Sat, 10 Dec 2016 20:45:50 +0100
|
||||
Subject: firmware-utils: add support for TL-WR1043ND v4 to mktplinkfw
|
||||
|
||||
The TL-WR1043ND v4 uses a kernel image with a mktplinkfw header inside the
|
||||
os-image partition of a tplink-safeloader image.
|
||||
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
Backport of LEDE 51740990cd1d5375a566454e692b479986cba958
|
||||
|
||||
diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
|
||||
index 34e6546a2d7db72748146ef233830c2e8de9ce97..fbf89609c22dd0fb50c4c8656141c8a8b9c29817 100644
|
||||
--- a/tools/firmware-utils/src/mktplinkfw.c
|
||||
+++ b/tools/firmware-utils/src/mktplinkfw.c
|
||||
@@ -178,6 +178,20 @@ static struct flash_layout layouts[] = {
|
||||
.kernel_ep = 0xc0000000,
|
||||
.rootfs_ofs = 0x2a0000,
|
||||
}, {
|
||||
+ /*
|
||||
+ Some devices (e.g. TL-WR1043 v4) use a mktplinkfw kernel image
|
||||
+ embedded in a tplink-safeloader image as os-image partition.
|
||||
+
|
||||
+ We use a 1.5MB partition for the compressed kernel, which should
|
||||
+ be sufficient, but not too wasteful (the flash of the TL-WR1043 v4
|
||||
+ has 16MB in total).
|
||||
+ */
|
||||
+ .id = "16Msafeloader",
|
||||
+ .fw_max_len = 0x180000,
|
||||
+ .kernel_la = 0x80060000,
|
||||
+ .kernel_ep = 0x80060000,
|
||||
+ .rootfs_ofs = 0,
|
||||
+ }, {
|
||||
/* terminating entry */
|
||||
}
|
||||
};
|
||||
@ -0,0 +1,464 @@
|
||||
From: Ludwig Thomeczek <ledesrc@wxorx.net>
|
||||
Date: Fri, 16 Dec 2016 12:50:34 +0100
|
||||
Subject: ar71xx: add support for TP-LINK WR1043ND v4
|
||||
|
||||
Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
|
||||
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
|
||||
index 67043d432cf7a469bf1ded14bc354274ab16e3e6..1b613dc6e8ee66f2d7ea32486c2b6ddd03bfba89 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/diag.sh
|
||||
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
|
||||
@@ -272,6 +272,7 @@ get_status_led() {
|
||||
tl-wr1041n-v2 | \
|
||||
tl-wr1043nd | \
|
||||
tl-wr1043nd-v2 | \
|
||||
+ tl-wr1043nd-v4 | \
|
||||
tl-wr741nd | \
|
||||
tl-wr741nd-v4 | \
|
||||
tl-wa801nd-v3 | \
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
|
||||
index e47cbb0b01ef4a335c059a74af66d9f8999b3b3d..fa38568fbc84aad4c85636c3894097c65e30eb9a 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
|
||||
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
|
||||
@@ -553,6 +553,16 @@ tl-wr1043nd-v2)
|
||||
ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
|
||||
;;
|
||||
|
||||
+tl-wr1043nd-v4)
|
||||
+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
|
||||
+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
|
||||
+ ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x20"
|
||||
+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
|
||||
+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
|
||||
+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
|
||||
+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
|
||||
+ ;;
|
||||
+
|
||||
tl-wr2543n)
|
||||
ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
|
||||
;;
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
|
||||
index 878623ce3fd8b7c585da73c7bd72794a144096a3..4389bc894f8dd08a9231b35bbb4fba0e9e57560b 100755
|
||||
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
|
||||
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
|
||||
@@ -208,6 +208,15 @@ tl-wr1043nd)
|
||||
ucidef_add_switch_vlan "switch0" "2" "0 5t"
|
||||
;;
|
||||
|
||||
+tl-wr1043nd-v4)
|
||||
+ ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
|
||||
+ ucidef_add_switch "switch0" "1" "1"
|
||||
+ ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
|
||||
+ ucidef_add_switch_vlan "switch0" "2" "0t 5"
|
||||
+ mac=$(mtd_get_mac_binary config 0x1017c)
|
||||
+ [ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
|
||||
+ ;;
|
||||
+
|
||||
tl-wr2543n)
|
||||
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
|
||||
ucidef_add_switch "switch0" "1" "1"
|
||||
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
|
||||
index 6df0d8a8d0d52c103b9ded2170af19a9a6b5f8bb..5922527da4980fa3b51fdcec2bca96f5962d0f0b 100755
|
||||
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
|
||||
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
|
||||
@@ -776,6 +776,9 @@ ar71xx_board_detect() {
|
||||
*"TL-WR1043ND v2")
|
||||
name="tl-wr1043nd-v2"
|
||||
;;
|
||||
+ *"TL-WR1043ND v4")
|
||||
+ name="tl-wr1043nd-v4"
|
||||
+ ;;
|
||||
*TL-WR2543N*)
|
||||
name="tl-wr2543n"
|
||||
;;
|
||||
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
|
||||
index 76c252ccb14db970aac63ea1d2eaddca3d867867..e61ebf7c2221fd56bb902f14d96cb25d174718ee 100755
|
||||
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
|
||||
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
|
||||
@@ -377,6 +377,7 @@ platform_check_image() {
|
||||
tl-wr1041n-v2 | \
|
||||
tl-wr1043nd | \
|
||||
tl-wr1043nd-v2 | \
|
||||
+ tl-wr1043nd-v4 | \
|
||||
tl-wr2543n)
|
||||
[ "$magic" != "0100" ] && {
|
||||
echo "Invalid image type."
|
||||
diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
|
||||
index 050362614a464b56d3740a7954686fe4e5b37803..ad0574f9ab67e78cd1359f8b45de5de51521718c 100644
|
||||
--- a/target/linux/ar71xx/config-3.18
|
||||
+++ b/target/linux/ar71xx/config-3.18
|
||||
@@ -131,6 +131,7 @@ CONFIG_ATH79_MACH_TL_WDR4300=y
|
||||
CONFIG_ATH79_MACH_TL_WR1041N_V2=y
|
||||
CONFIG_ATH79_MACH_TL_WR1043ND=y
|
||||
CONFIG_ATH79_MACH_TL_WR1043ND_V2=y
|
||||
+CONFIG_ATH79_MACH_TL_WR1043ND_V4=y
|
||||
CONFIG_ATH79_MACH_TL_WR2543N=y
|
||||
CONFIG_ATH79_MACH_TL_WR703N=y
|
||||
CONFIG_ATH79_MACH_TL_WR720N_V3=y
|
||||
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..cb224f4611004aaaec6c3b2b737b3bb45c79d239
|
||||
--- /dev/null
|
||||
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
|
||||
@@ -0,0 +1,190 @@
|
||||
+/*
|
||||
+ * TP-LINK WR1043 V4 support
|
||||
+ *
|
||||
+ * Copyright (C) 2015-2016 P. Wassi <p.wassi at gmx.at>
|
||||
+ * Copyright (C) 2016 Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
+ * Copyright (C) 2016 Andreas Ziegler <github@andreas-ziegler.de>
|
||||
+ * Copyright (C) 2016 Ludwig Thomeczek <ledesrc@wxorx.net>
|
||||
+ *
|
||||
+ * Derived from: mach-dir-869-a1.c
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 as published
|
||||
+ * by the Free Software Foundation.
|
||||
+ */
|
||||
+
|
||||
+
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/ath9k_platform.h>
|
||||
+
|
||||
+#include <asm/mach-ath79/ath79.h>
|
||||
+#include <asm/mach-ath79/irq.h>
|
||||
+#include <asm/mach-ath79/ar71xx_regs.h>
|
||||
+
|
||||
+#include <linux/platform_data/phy-at803x.h>
|
||||
+#include <linux/ar8216_platform.h>
|
||||
+
|
||||
+#include "common.h"
|
||||
+#include "dev-ap9x-pci.h"
|
||||
+#include "dev-eth.h"
|
||||
+#include "dev-gpio-buttons.h"
|
||||
+#include "dev-leds-gpio.h"
|
||||
+#include "dev-m25p80.h"
|
||||
+#include "dev-wmac.h"
|
||||
+#include "dev-usb.h"
|
||||
+#include "machtypes.h"
|
||||
+#include "nvram.h"
|
||||
+
|
||||
+#define TL_WR1043_V4_GPIO_BTN_RESET 2
|
||||
+#define TL_WR1043_V4_GPIO_BTN_RFKILL 5
|
||||
+
|
||||
+#define TL_WR1043_V4_GPIO_LED_WLAN 19
|
||||
+#define TL_WR1043_V4_GPIO_LED_USB 7
|
||||
+#define TL_WR1043_V4_GPIO_LED_WPS 1
|
||||
+#define TL_WR1043_V4_GPIO_LED_SYSTEM 6
|
||||
+
|
||||
+#define TL_WR1043_V4_GPIO_USB_POWER 8
|
||||
+
|
||||
+#define TL_WR1043_V4_GPIO_LED_WAN 15
|
||||
+#define TL_WR1043_V4_GPIO_LED_LAN1 9
|
||||
+#define TL_WR1043_V4_GPIO_LED_LAN2 14
|
||||
+#define TL_WR1043_V4_GPIO_LED_LAN3 21
|
||||
+#define TL_WR1043_V4_GPIO_LED_LAN4 20
|
||||
+
|
||||
+#define TL_WR1043_V4_KEYS_POLL_INTERVAL 20 /* msecs */
|
||||
+#define TL_WR1043_V4_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR1043_V4_KEYS_POLL_INTERVAL)
|
||||
+
|
||||
+#define TL_WR1043_V4_MAC_LOCATION 0x1ff80174
|
||||
+
|
||||
+#define TL_WR1043_V4_EEPROM_ADDR 0x1fff0000
|
||||
+#define TL_WR1043_V4_WMAC_CALDATA_OFFSET 0x1000
|
||||
+
|
||||
+static struct gpio_led tl_wr1043nd_v4_leds_gpio[] __initdata = {
|
||||
+ {
|
||||
+ .name = "tp-link:green:wps",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_WPS,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:system",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_SYSTEM,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:wlan",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_WLAN,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:usb",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_USB,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:wan",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_WAN,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:lan1",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_LAN1,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:lan2",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_LAN2,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:lan3",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_LAN3,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "tp-link:green:lan4",
|
||||
+ .gpio = TL_WR1043_V4_GPIO_LED_LAN4,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct gpio_keys_button tl_wr1043nd_v4_gpio_keys[] __initdata = {
|
||||
+ {
|
||||
+ .desc = "Reset button",
|
||||
+ .type = EV_KEY,
|
||||
+ .code = KEY_RESTART,
|
||||
+ .debounce_interval = TL_WR1043_V4_KEYS_DEBOUNCE_INTERVAL,
|
||||
+ .gpio = TL_WR1043_V4_GPIO_BTN_RESET,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .desc = "RFKILL button",
|
||||
+ .type = EV_KEY,
|
||||
+ .code = KEY_RFKILL,
|
||||
+ .debounce_interval = TL_WR1043_V4_KEYS_DEBOUNCE_INTERVAL,
|
||||
+ .gpio = TL_WR1043_V4_GPIO_BTN_RFKILL,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct ar8327_pad_cfg tl_wr1043nd_v4_ar8327_pad0_cfg = {
|
||||
+ .mode = AR8327_PAD_MAC_SGMII,
|
||||
+ .sgmii_delay_en = true,
|
||||
+};
|
||||
+
|
||||
+static struct ar8327_platform_data tl_wr1043nd_v4_ar8327_data = {
|
||||
+ .pad0_cfg = &tl_wr1043nd_v4_ar8327_pad0_cfg,
|
||||
+ .port0_cfg = {
|
||||
+ .force_link = 1,
|
||||
+ .speed = AR8327_PORT_SPEED_1000,
|
||||
+ .duplex = 1,
|
||||
+ .txpause = 1,
|
||||
+ .rxpause = 1,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct mdio_board_info tl_wr1043nd_v4_mdio0_info[] = {
|
||||
+ {
|
||||
+ .bus_id = "ag71xx-mdio.0",
|
||||
+ .phy_addr = 0,
|
||||
+ .platform_data = &tl_wr1043nd_v4_ar8327_data,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static void __init tl_wr1043nd_v4_setup(void)
|
||||
+{
|
||||
+ u8 *mac = (u8 *) KSEG1ADDR(TL_WR1043_V4_MAC_LOCATION);
|
||||
+ u8 *eeprom = (u8 *) KSEG1ADDR(TL_WR1043_V4_EEPROM_ADDR);
|
||||
+
|
||||
+ ath79_register_m25p80(NULL);
|
||||
+
|
||||
+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
|
||||
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
|
||||
+ ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
|
||||
+ ath79_eth0_data.phy_mask = BIT(0);
|
||||
+
|
||||
+ mdiobus_register_board_info(tl_wr1043nd_v4_mdio0_info,
|
||||
+ ARRAY_SIZE(tl_wr1043nd_v4_mdio0_info));
|
||||
+
|
||||
+ ath79_register_usb();
|
||||
+ ath79_register_mdio(0, 0);
|
||||
+ ath79_register_eth(0);
|
||||
+
|
||||
+ ath79_register_wmac(eeprom + TL_WR1043_V4_WMAC_CALDATA_OFFSET, mac);
|
||||
+
|
||||
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1043nd_v4_leds_gpio),
|
||||
+ tl_wr1043nd_v4_leds_gpio);
|
||||
+
|
||||
+ ath79_register_gpio_keys_polled(-1, TL_WR1043_V4_KEYS_POLL_INTERVAL,
|
||||
+ ARRAY_SIZE(tl_wr1043nd_v4_gpio_keys),
|
||||
+ tl_wr1043nd_v4_gpio_keys);
|
||||
+
|
||||
+ gpio_request_one(TL_WR1043_V4_GPIO_USB_POWER,
|
||||
+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
|
||||
+ "USB power");
|
||||
+}
|
||||
+
|
||||
+MIPS_MACHINE(ATH79_MACH_TL_WR1043ND_V4, "TL-WR1043ND-v4",
|
||||
+ "TP-LINK TL-WR1043ND v4", tl_wr1043nd_v4_setup);
|
||||
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
|
||||
index 638e97f088b5420cf4f2a3c706875677815240e1..61e221255f6742f9594da168b11af7716d6a720e 100644
|
||||
--- a/target/linux/ar71xx/image/Makefile
|
||||
+++ b/target/linux/ar71xx/image/Makefile
|
||||
@@ -73,6 +73,18 @@ define Build/mktplinkfw-combined
|
||||
@mv $@.new $@
|
||||
endef
|
||||
|
||||
+define Build/tplink-safeloader
|
||||
+ -$(STAGING_DIR_HOST)/bin/tplink-safeloader \
|
||||
+ -B $(TPLINK_BOARD_NAME) \
|
||||
+ -V $(REVISION) \
|
||||
+ -k $(word 1,$^) \
|
||||
+ -r $@ \
|
||||
+ -o $@.new \
|
||||
+ -j \
|
||||
+ $(wordlist 2,$(words $(1)),$(1)) \
|
||||
+ $(if $(findstring sysupgrade,$(word 1,$(1))),-S) && mv $@.new $@ || rm -f $@
|
||||
+endef
|
||||
+
|
||||
define Build/loader-common
|
||||
rm -rf $@.src
|
||||
$(MAKE) -C lzma-loader \
|
||||
@@ -103,7 +115,7 @@ define Build/copy-file
|
||||
cat "$(1)" > "$@"
|
||||
endef
|
||||
|
||||
-DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT
|
||||
+DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_BOARD_NAME
|
||||
|
||||
define Device/Default
|
||||
BOARDNAME :=
|
||||
@@ -677,6 +689,22 @@ define Device/tl-wr1041n-v2
|
||||
endef
|
||||
TARGET_DEVICES += tl-wr1041n-v2
|
||||
|
||||
+define Device/tl-wr1043nd-v4
|
||||
+ $(Device/tplink)
|
||||
+ BOARDNAME := TL-WR1043ND-v4
|
||||
+ DEVICE_PROFILE := TLWR1043
|
||||
+ TPLINK_HWID := 0x10430004
|
||||
+ TPLINK_FLASHLAYOUT := 16Msafeloader
|
||||
+ 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)
|
||||
+ IMAGE_SIZE := 15552k
|
||||
+ TPLINK_BOARD_NAME := TLWR1043NDV4
|
||||
+ KERNEL := kernel-bin | patch-cmdline | lzma | mktplinkfw-combined
|
||||
+ IMAGES := sysupgrade.bin factory.bin
|
||||
+ IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
|
||||
+ IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
|
||||
+endef
|
||||
+TARGET_DEVICES += tl-wr1043nd-v4
|
||||
+
|
||||
define Device/tl-wdr4900-v2
|
||||
$(Device/tplink-8mlzma)
|
||||
BOARDNAME := TL-WDR4900-v2
|
||||
diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
|
||||
index 75155b22489a60748b3b1357a1d9c549092255ba..06850dfd5ad9dc004e5e06605c642d0f934aad6f 100644
|
||||
--- a/target/linux/ar71xx/mikrotik/config-default
|
||||
+++ b/target/linux/ar71xx/mikrotik/config-default
|
||||
@@ -85,6 +85,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
|
||||
# CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR1043ND is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR1043ND_V2 is not set
|
||||
+# CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR2543N is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR703N is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR720N_V3 is not set
|
||||
diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
|
||||
index 802d6e0502b51a4ecf2259c20e9b6667cd255680..6d69cdcd1cc7f911fbb68dc265ef3fa4c7f5bd78 100644
|
||||
--- a/target/linux/ar71xx/nand/config-default
|
||||
+++ b/target/linux/ar71xx/nand/config-default
|
||||
@@ -49,6 +49,7 @@
|
||||
# CONFIG_ATH79_MACH_TL_WDR4300 is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR1043ND is not set
|
||||
+# CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR2543N is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR703N is not set
|
||||
# CONFIG_ATH79_MACH_TL_WR720N_V3 is not set
|
||||
diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
|
||||
index b7517464742679b66c3bd916b9b2a2fcc34b65e1..fb69cf3b9ee51e39c32a9e98de913c1a84bed56a 100644
|
||||
--- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
|
||||
+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/ath79/machtypes.h
|
||||
+++ b/arch/mips/ath79/machtypes.h
|
||||
-@@ -16,22 +16,206 @@
|
||||
+@@ -16,22 +16,207 @@
|
||||
|
||||
enum ath79_mach_type {
|
||||
ATH79_MACH_GENERIC = 0,
|
||||
@@ -138,6 +138,7 @@
|
||||
+ ATH79_MACH_TL_WR1041N_V2, /* TP-LINK TL-WR1041N v2 */
|
||||
+ ATH79_MACH_TL_WR1043ND, /* TP-LINK TL-WR1043ND */
|
||||
+ ATH79_MACH_TL_WR1043ND_V2, /* TP-LINK TL-WR1043ND v2 */
|
||||
++ ATH79_MACH_TL_WR1043ND_V4, /* TP-LINK TL-WR1043ND v4 */
|
||||
+ ATH79_MACH_TL_WR2543N, /* TP-LINK TL-WR2543N/ND */
|
||||
+ ATH79_MACH_TL_WR703N, /* TP-LINK TL-WR703N */
|
||||
+ ATH79_MACH_TL_WR710N, /* TP-LINK TL-WR710N */
|
||||
@@ -355,7 +356,7 @@
|
||||
config ATH79_MACH_PB44
|
||||
bool "Atheros PB44 reference board"
|
||||
select SOC_AR71XX
|
||||
-@@ -68,6 +178,976 @@ config ATH79_MACH_PB44
|
||||
+@@ -68,6 +178,988 @@ config ATH79_MACH_PB44
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Atheros PB44 reference board.
|
||||
|
||||
@@ -1270,6 +1271,18 @@
|
||||
+ select ATH79_DEV_USB
|
||||
+ select ATH79_DEV_WMAC
|
||||
+
|
||||
++config ATH79_MACH_TL_WR1043ND_V4
|
||||
++ bool "TP-LINK TL-WR1043ND v4 support"
|
||||
++ select SOC_QCA956X
|
||||
++ select ATH79_DEV_AP9X_PCI if PCI
|
||||
++ select ATH79_DEV_ETH
|
||||
++ select ATH79_DEV_GPIO_BUTTONS
|
||||
++ select ATH79_DEV_LEDS_GPIO
|
||||
++ select ATH79_DEV_M25P80
|
||||
++ select ATH79_DEV_USB
|
||||
++ select ATH79_DEV_WMAC
|
||||
++
|
||||
++
|
||||
+config ATH79_MACH_TL_WR2543N
|
||||
+ bool "TP-LINK TL-WR2543N/ND support"
|
||||
+ select SOC_AR724X
|
||||
@@ -1332,7 +1345,7 @@
|
||||
config ATH79_MACH_UBNT_XM
|
||||
bool "Ubiquiti Networks XM/UniFi boards"
|
||||
select SOC_AR724X
|
||||
-@@ -83,6 +1163,117 @@ config ATH79_MACH_UBNT_XM
|
||||
+@@ -83,6 +1175,117 @@ config ATH79_MACH_UBNT_XM
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Ubiquiti Networks XM (rev 1.0) board.
|
||||
|
||||
@@ -1450,7 +1463,7 @@
|
||||
endmenu
|
||||
|
||||
config SOC_AR71XX
|
||||
-@@ -124,7 +1315,10 @@ config ATH79_DEV_DSA
|
||||
+@@ -124,7 +1327,10 @@ config ATH79_DEV_DSA
|
||||
config ATH79_DEV_ETH
|
||||
def_bool n
|
||||
|
||||
@@ -1462,7 +1475,7 @@
|
||||
def_bool n
|
||||
|
||||
config ATH79_DEV_GPIO_BUTTONS
|
||||
-@@ -154,6 +1348,11 @@ config ATH79_PCI_ATH9K_FIXUP
|
||||
+@@ -154,6 +1360,11 @@ config ATH79_PCI_ATH9K_FIXUP
|
||||
def_bool n
|
||||
|
||||
config ATH79_ROUTERBOOT
|
||||
@@ -1476,7 +1489,7 @@
|
||||
endif
|
||||
--- a/arch/mips/ath79/Makefile
|
||||
+++ b/arch/mips/ath79/Makefile
|
||||
-@@ -38,9 +47,131 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
|
||||
+@@ -38,9 +38,132 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
|
||||
#
|
||||
# Machines
|
||||
#
|
||||
@@ -1575,6 +1588,7 @@
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2) += mach-tl-wr1043nd-v2.o
|
||||
++obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V4) += mach-tl-wr1043nd-v4.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR2543N) += mach-tl-wr2543n.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR703N) += mach-tl-wr703n.o
|
||||
+obj-$(CONFIG_ATH79_MACH_TL_WR720N_V3) += mach-tl-wr720n-v3.o
|
||||
@ -113,6 +113,7 @@ $(eval $(call GluonProfile,TLWR1043))
|
||||
$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1,tp-link-tl-wr1043n-nd-v1))
|
||||
$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2,tp-link-tl-wr1043n-nd-v2))
|
||||
$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v3,tp-link-tl-wr1043n-nd-v3))
|
||||
$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v4,tp-link-tl-wr1043n-nd-v4))
|
||||
|
||||
# TL-WDR3500/3600/4300 v1
|
||||
$(eval $(call GluonProfile,TLWDR4300))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user