X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Ffirmware-utils%2Fsrc%2Ftplink-safeloader.c;h=65034e3804067d11bbcd065f517729eccf5111a4;hb=30f48fb107506829975fc18711d41059368e2faa;hp=f1883cd63697ed8b4cced59d32fc420c2baca362;hpb=4ec9763ee93243464af9943f360e945e7ce9faed;p=openwrt%2Fstaging%2Fwigyori.git diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index f1883cd636..65034e3804 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -210,7 +210,17 @@ static struct device_info boards[] = { "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", + "CPE520(TP-LINK|EU|N300-5):1.1\r\n" + "CPE510(TP-LINK|EU|N300-5|00000000):2.0\r\n" + "CPE510(TP-LINK|EU|N300-5|45550000):2.0\r\n" + "CPE510(TP-LINK|EU|N300-5|55530000):2.0\r\n" + "CPE510(TP-LINK|UN|N300-5|00000000):2.0\r\n" + "CPE510(TP-LINK|UN|N300-5|45550000):2.0\r\n" + "CPE510(TP-LINK|UN|N300-5|55530000):2.0\r\n" + "CPE510(TP-LINK|US|N300-5|55530000):2.0\r\n" + "CPE510(TP-LINK|UN|N300-5):2.0\r\n" + "CPE510(TP-LINK|EU|N300-5):2.0\r\n" + "CPE510(TP-LINK|US|N300-5):2.0\r\n", .support_trail = '\xff', .soft_ver = NULL, @@ -347,6 +357,46 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "file-system" }, + /** Firmware layout for the A7-V5 */ + { + .id = "ARCHER-A7-V5", + .support_list = + "SupportList:\n" + "{product_name:Archer A7,product_ver:5.0.0,special_id:45550000}\n" + "{product_name:Archer A7,product_ver:5.0.0,special_id:55530000}\n" + "{product_name:Archer A7,product_ver:5.0.0,special_id:43410000}\n" + "{product_name:Archer A7,product_ver:5.0.0,special_id:4A500000}\n" + "{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n", + .support_trail = '\x00', + .soft_ver = "soft_ver:1.0.0\n", + + /* We're using a dynamic kernel/rootfs split here */ + .partitions = { + {"factory-boot", 0x00000, 0x20000}, + {"fs-uboot", 0x20000, 0x20000}, + {"firmware", 0x40000, 0xec0000}, /* Stock: name os-image base 0x40000 size 0x120000 */ + /* Stock: name file-system base 0x160000 size 0xda0000 */ + {"default-mac", 0xf40000, 0x00200}, + {"pin", 0xf40200, 0x00200}, + {"device-id", 0xf40400, 0x00100}, + {"product-info", 0xf40500, 0x0fb00}, + {"soft-version", 0xf50000, 0x00100}, + {"extra-para", 0xf51000, 0x01000}, + {"support-list", 0xf52000, 0x0a000}, + {"profile", 0xf5c000, 0x04000}, + {"default-config", 0xf60000, 0x10000}, + {"user-config", 0xf70000, 0x40000}, + {"certificate", 0xfb0000, 0x10000}, + {"partition-table", 0xfc0000, 0x10000}, + {"log", 0xfd0000, 0x20000}, + {"radio", 0xff0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system", + }, + /** Firmware layout for the C25v1 */ { .id = "ARCHER-C25-V1", @@ -358,16 +408,12 @@ static struct device_info boards[] = { .support_trail = '\x00', .soft_ver = "soft_ver:1.0.0\n", - /** - 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 = { {"factory-boot", 0x00000, 0x20000}, {"fs-uboot", 0x20000, 0x10000}, - {"os-image", 0x30000, 0x180000}, /* Stock: base 0x30000 size 0x100000 */ - {"file-system", 0x1b0000, 0x620000}, /* Stock: base 0x130000 size 0x6a0000 */ + {"firmware", 0x30000, 0x7a0000}, /* Stock: name os-image base 0x30000 size 0x100000 */ + /* Stock: name file-system base 0x130000 size 0x6a0000 */ {"user-config", 0x7d0000, 0x04000}, {"default-mac", 0x7e0000, 0x00100}, {"device-id", 0x7e0100, 0x00100}, @@ -413,8 +459,7 @@ static struct device_info boards[] = { {"profile", 0x11700, 0x03900}, {"default-config", 0x15000, 0x04000}, {"user-config", 0x19000, 0x04000}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0x648000}, + {"firmware", 0x20000, 0x7c8000}, {"certyficate", 0x7e8000, 0x08000}, {"radio", 0x7f0000, 0x10000}, {NULL, 0, 0} @@ -437,14 +482,14 @@ static struct device_info boards[] = { .support_trail = '\x00', .soft_ver = "soft_ver:1.0.0\n", + /* We're using a dynamic kernel/rootfs split here */ .partitions = { {"fs-uboot", 0x00000, 0x10000}, {"default-mac", 0x10000, 0x00200}, {"pin", 0x10200, 0x00200}, {"device-id", 0x10400, 0x00100}, {"product-info", 0x10500, 0x0fb00}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0xcb0000}, + {"firmware", 0x20000, 0xe30000}, {"partition-table", 0xe50000, 0x10000}, {"soft-version", 0xe60000, 0x10000}, {"support-list", 0xe70000, 0x10000}, @@ -463,6 +508,82 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "file-system", }, + /** Firmware layout for the C59v2 */ + { + .id = "ARCHER-C59-V2", + .vendor = "", + .support_list = + "SupportList:\r\n" + "{product_name:Archer C59,product_ver:2.0.0,special_id:00000000}\r\n" + "{product_name:Archer C59,product_ver:2.0.0,special_id:45550000}\r\n" + "{product_name:Archer C59,product_ver:2.0.0,special_id:55530000}\r\n", + .support_trail = '\x00', + .soft_ver = "soft_ver:2.0.0 Build 20161206 rel.7303\n", + + /** We're using a dynamic kernel/rootfs split here */ + .partitions = { + {"factory-boot", 0x00000, 0x20000}, + {"fs-uboot", 0x20000, 0x10000}, + {"default-mac", 0x30000, 0x00200}, + {"pin", 0x30200, 0x00200}, + {"device-id", 0x30400, 0x00100}, + {"product-info", 0x30500, 0x0fb00}, + {"firmware", 0x40000, 0xe10000}, + {"partition-table", 0xe50000, 0x10000}, + {"soft-version", 0xe60000, 0x10000}, + {"support-list", 0xe70000, 0x10000}, + {"profile", 0xe80000, 0x10000}, + {"default-config", 0xe90000, 0x10000}, + {"user-config", 0xea0000, 0x40000}, + {"usb-config", 0xee0000, 0x10000}, + {"certificate", 0xef0000, 0x10000}, + {"extra-para", 0xf00000, 0x10000}, + {"qos-db", 0xf10000, 0x30000}, + {"log", 0xfe0000, 0x10000}, + {"radio", 0xff0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system", + }, + + /** Firmware layout for the C6v2 */ + { + .id = "ARCHER-C6-V2", + .vendor = "", + .support_list = + "SupportList:\r\n" + "{product_name:Archer C6,product_ver:2.0.0,special_id:45550000}\r\n" + "{product_name:Archer C6,product_ver:2.0.0,special_id:52550000}\r\n" + "{product_name:Archer C6,product_ver:2.0.0,special_id:4A500000}\r\n", + .support_trail = '\x00', + .soft_ver = "soft_ver:1.0.0\n", + + .partitions = { + {"fs-uboot", 0x00000, 0x20000}, + {"default-mac", 0x20000, 0x00200}, + {"pin", 0x20200, 0x00100}, + {"product-info", 0x20300, 0x00200}, + {"device-id", 0x20500, 0x0fb00}, + {"firmware", 0x30000, 0x7a9400}, + {"soft-version", 0x7d9400, 0x00100}, + {"extra-para", 0x7d9500, 0x00100}, + {"support-list", 0x7d9600, 0x00200}, + {"profile", 0x7d9800, 0x03000}, + {"default-config", 0x7dc800, 0x03000}, + {"partition-table", 0x7df800, 0x00800}, + {"user-config", 0x7e0000, 0x0c000}, + {"certificate", 0x7ec000, 0x04000}, + {"radio", 0x7f0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system", + }, + + /** Firmware layout for the C60v1 */ { .id = "ARCHER-C60-V1", @@ -487,8 +608,7 @@ static struct device_info boards[] = { {"profile", 0x11700, 0x03900}, {"default-config", 0x15000, 0x04000}, {"user-config", 0x19000, 0x04000}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0x648000}, + {"firmware", 0x20000, 0x7c8000}, {"certyficate", 0x7e8000, 0x08000}, {"radio", 0x7f0000, 0x10000}, {NULL, 0, 0} @@ -517,8 +637,7 @@ static struct device_info boards[] = { {"product-info", 0x1fe00, 0x00100}, {"device-id", 0x1ff00, 0x00100}, {"fs-uboot", 0x20000, 0x10000}, - {"os-image", 0x30000, 0x180000}, - {"file-system", 0x1b0000, 0x620000}, + {"firmware", 0x30000, 0x7a0000}, {"soft-version", 0x7d9500, 0x00100}, {"support-list", 0x7d9600, 0x00100}, {"extra-para", 0x7d9700, 0x00100}, @@ -588,16 +707,12 @@ static struct device_info boards[] = { .support_trail = '\x00', .soft_ver = "soft_ver:1.0.0\n", - /** - 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 = { {"factory-boot", 0x00000, 0x20000}, {"fs-uboot", 0x20000, 0x20000}, - {"os-image", 0x40000, 0x180000}, /* Stock: base 0x40000 size 0x120000 */ - {"file-system", 0x1c0000, 0xd40000}, /* Stock: base 0x160000 size 0xda0000 */ + {"firmware", 0x40000, 0xEC0000}, /* Stock: name os-image base 0x40000 size 0x120000 */ + /* Stock: name file-system base 0x160000 size 0xda0000 */ {"default-mac", 0xf00000, 0x00200}, {"pin", 0xf00200, 0x00200}, {"device-id", 0xf00400, 0x00100}, @@ -626,16 +741,17 @@ static struct device_info boards[] = { .support_list = "SupportList:\n" "{product_name:Archer C7,product_ver:5.0.0,special_id:00000000}\n" - "{product_name:Archer C7,product_ver:5.0.0,special_id:55530000}\n", + "{product_name:Archer C7,product_ver:5.0.0,special_id:45550000}\n" + "{product_name:Archer C7,product_ver:5.0.0,special_id:55530000}\n" + "{product_name:Archer C7,product_ver:5.0.0,special_id:43410000}\n" + "{product_name:Archer C7,product_ver:5.0.0,special_id:4A500000}\n" + "{product_name:Archer C7,product_ver:5.0.0,special_id:54570000}\n" + "{product_name:Archer C7,product_ver:5.0.0,special_id:52550000}\n", .support_trail = '\x00', .soft_ver = "soft_ver:1.0.0\n", - /** - 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 = { {"factory-boot", 0x00000, 0x20000}, {"fs-uboot", 0x20000, 0x20000}, @@ -652,8 +768,8 @@ static struct device_info boards[] = { {"user-config", 0x80000, 0x40000}, - {"os-image", 0xc0000, 0x180000}, /* Stock: base 0xc0000 size 0x120000 */ - {"file-system", 0x240000, 0xd80000}, /* Stock: base 0x1e0000 size 0xde0000 */ + {"firmware", 0xc0000, 0xf00000}, /* Stock: name os-image base 0xc0000 size 0x120000 */ + /* Stock: name file-system base 0x1e0000 size 0xde0000 */ {"log", 0xfc0000, 0x20000}, {"certificate", 0xfe0000, 0x10000}, @@ -827,8 +943,7 @@ static struct device_info boards[] = { .partitions = { {"factory-boot", 0x00000, 0x20000}, {"fs-uboot", 0x20000, 0x20000}, - {"os-image", 0x40000, 0x180000}, - {"file-system", 0x1c0000, 0xd40000}, + {"firmware", 0x40000, 0xec0000}, {"default-mac", 0xf00000, 0x00200}, {"pin", 0xf00200, 0x00200}, {"device-id", 0xf00400, 0x00100}, @@ -899,8 +1014,7 @@ static struct device_info boards[] = { */ .partitions = { {"fs-uboot", 0x00000, 0x20000}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0x5b0000}, + {"firmware", 0x20000, 0x730000}, {"default-mac", 0x750000, 0x00200}, {"pin", 0x750200, 0x00200}, {"product-info", 0x750400, 0x0fc00}, @@ -932,8 +1046,7 @@ static struct device_info boards[] = { .partitions = { {"fs-uboot", 0x00000, 0x20000}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0xca0000}, + {"firmware", 0x20000, 0xe20000}, {"default-mac", 0xe40000, 0x00200}, {"pin", 0xe40200, 0x00200}, {"product-info", 0xe40400, 0x0fc00}, @@ -1010,15 +1123,10 @@ static struct device_info boards[] = { .support_trail = '\x00', .soft_ver = NULL, - /** - The flash partition table for RE355; - it is almost the same as the one used by the stock images, - 576KB were moved from file-system to os-image. - */ + /* We're using a dynamic kernel/rootfs split here */ .partitions = { {"fs-uboot", 0x00000, 0x20000}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0x460000}, + {"firmware", 0x20000, 0x5e0000}, {"partition-table", 0x600000, 0x02000}, {"default-mac", 0x610000, 0x00020}, {"pin", 0x610100, 0x00020}, @@ -1053,15 +1161,49 @@ static struct device_info boards[] = { .support_trail = '\x00', .soft_ver = NULL, - /** - The flash partition table for RE450; - it is almost the same as the one used by the stock images, - 576KB were moved from file-system to os-image. - */ + /** We're using a dynamic kernel/rootfs split here */ + .partitions = { + {"fs-uboot", 0x00000, 0x20000}, + {"firmware", 0x20000, 0x5e0000}, + {"partition-table", 0x600000, 0x02000}, + {"default-mac", 0x610000, 0x00020}, + {"pin", 0x610100, 0x00020}, + {"product-info", 0x611100, 0x01000}, + {"soft-version", 0x620000, 0x01000}, + {"support-list", 0x621000, 0x01000}, + {"profile", 0x622000, 0x08000}, + {"user-config", 0x630000, 0x10000}, + {"default-config", 0x640000, 0x10000}, + {"radio", 0x7f0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system" + }, + + /** Firmware layout for the RE450 v2 */ + { + .id = "RE450-V2", + .vendor = "", + .support_list = + "SupportList:\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:00000000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:55530000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:45550000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:4A500000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:43410000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:41550000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:41530000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:4B520000}\r\n" + "{product_name:RE450,product_ver:2.0.0,special_id:42520000}\r\n", + .support_trail = '\x00', + .soft_ver = NULL, + + /* We're using a dynamic kernel/rootfs split here */ .partitions = { {"fs-uboot", 0x00000, 0x20000}, - {"os-image", 0x20000, 0x180000}, - {"file-system", 0x1a0000, 0x460000}, + {"firmware", 0x20000, 0x5e0000}, {"partition-table", 0x600000, 0x02000}, {"default-mac", 0x610000, 0x00020}, {"pin", 0x610100, 0x00020}, @@ -1072,6 +1214,7 @@ static struct device_info boards[] = { {"user-config", 0x630000, 0x10000}, {"default-config", 0x640000, 0x10000}, {"radio", 0x7f0000, 0x10000}, + {NULL, 0, 0} }, @@ -1509,14 +1652,19 @@ static void build_image(const char *output, parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof, file_system_partition); /* Some devices need the extra-para partition to accept the firmware */ - if (strcasecmp(info->id, "ARCHER-C25-V1") == 0 || + if (strcasecmp(info->id, "ARCHER-C2-V3") == 0 || + strcasecmp(info->id, "ARCHER-C25-V1") == 0 || + strcasecmp(info->id, "ARCHER-C59-V2") == 0 || strcasecmp(info->id, "ARCHER-C60-V2") == 0 || strcasecmp(info->id, "TLWR1043NV5") == 0) { const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}; parts[5] = put_data("extra-para", mdat, 11); - } else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) { + } else if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 || strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id, "ARCHER-C7-V5") == 0) { const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00}; parts[5] = put_data("extra-para", mdat, 11); + } else if (strcasecmp(info->id, "ARCHER-C6-V2") == 0) { + const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00}; + parts[5] = put_data("extra-para", mdat, 11); } size_t len; @@ -1598,6 +1746,10 @@ static int add_flash_partition( } part_list->name = calloc(1, strlen(name) + 1); + if (!part_list->name) { + error(1, 0, "Unable to allocate memory"); + } + memcpy((char *)part_list->name, name, strlen(name)); part_list->base = base; part_list->size = size;