From patchwork Mon Jan 4 01:17:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Bendavid X-Patchwork-Id: 562219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D32961402DE for ; Mon, 4 Jan 2016 12:18:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ly1Ult55; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4AA3928C05F; Mon, 4 Jan 2016 02:17:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CEDD728BEC1 for ; Mon, 4 Jan 2016 02:17:10 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-qk0-f182.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-qk0-f182.google.com (mail-qk0-f182.google.com [209.85.220.182]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 4 Jan 2016 02:16:55 +0100 (CET) Received: by mail-qk0-f182.google.com with SMTP id p186so43882479qke.0 for ; Sun, 03 Jan 2016 17:17:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=nVk0LBtJOEOyZuchK/cPz2Ja3otglczgXwIw+LL1ZOc=; b=ly1Ult55YlmUAEyAkkHjjYTYT8l5254NSYefxzfRvtItbyJpEa6KnwcGeCtEuL/omg PkoDS8zvClvde8eO1LoQVbtz10sOM39Rq+725lQosOQEREYj9kOGbIN8qOew8Ax0DX2C Xj/qLa3kgJhv7Rq9ED2UChE17cPGPuWfwvs/OESdWXzHzCu8Cnrq6Ej8qlmV60CzBYft tFTxUN8WPzLdmiPLEdwrwuA4Ex9dc1Q/E1kN9urPBC7OsuieCxHIKUwc/8ZlCqkFWqB3 OgWZNk2+PdsuhbjAVsoKrax/kldo2I+7lZYHS3lDsrV3up8LA/3AKj/UQ/+a/JjQK6wW QAvg== X-Received: by 10.55.77.216 with SMTP id a207mr111383812qkb.80.1451870242222; Sun, 03 Jan 2016 17:17:22 -0800 (PST) Received: from theMuleNotebook.localdomain (CPE40167ea25a60-CM00fc8de179d0.cpe.net.cable.rogers.com. [174.112.92.123]) by smtp.gmail.com with ESMTPSA id y199sm38791946qhb.4.2016.01.03.17.17.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Jan 2016 17:17:21 -0800 (PST) From: Josh Bendavid To: openwrt-devel@lists.openwrt.org Date: Mon, 4 Jan 2016 02:17:10 +0100 Message-Id: <1451870230-5787-1-git-send-email-joshbendavid@gmail.com> X-Mailer: git-send-email 2.6.4 Subject: [OpenWrt-Devel] [PATCH 2/3] firmware-utils: add support for TP-Link Archer C2600 to tplink-safeloader X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Add support for TP-Link Archer C2600 to tplink-safeloader including partition table and additional SupportList strings. Both factory and sysupgrade images are supported. Signed-off-by: Josh Bendavid --- tools/firmware-utils/src/tplink-safeloader.c | 114 ++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 3 deletions(-) diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 77a894b..f43ffd5 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);