From patchwork Sun May 29 00:02:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander 'lynxis' Couzens X-Patchwork-Id: 627462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rHKkM12lgz9t3V for ; Sun, 29 May 2016 10:04:42 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6oC5-00087D-7r; Sun, 29 May 2016 00:03:01 +0000 Received: from mail.base45.de ([2001:67c:2050:310::a:2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6oC1-0007x3-V5 for lede-dev@lists.infradead.org; Sun, 29 May 2016 00:02:59 +0000 Received: from ip5b41c611.dynamic.kabel-deutschland.de ([91.65.198.17] helo=lazus.yip) by mail.base45.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.82) (envelope-from ) id 1b6oBf-0002bm-FW; Sun, 29 May 2016 02:02:35 +0200 From: Alexander Couzens To: lede-dev@lists.infradead.org Date: Sun, 29 May 2016 02:02:20 +0200 Message-Id: <20160529000220.29098-2-lynxis@fe80.eu> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160529000220.29098-1-lynxis@fe80.eu> References: <20160529000220.29098-1-lynxis@fe80.eu> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160528_170258_190239_84028037 X-CRM114-Status: GOOD ( 10.58 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH 2/2] tools/tplink-safeloader: split CPE210 from CPE510 profile X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Couzens MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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 --- target/linux/ar71xx/image/tp-link.mk | 1 + tools/firmware-utils/src/tplink-safeloader.c | 33 +++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 92bf55c..9bbf5a8 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -113,6 +113,7 @@ endef define Device/cpe210-220 $(Device/cpe510-520) BOARDNAME := CPE210 + TPLINK_BOARD_NAME := CPE210 endef TARGET_DEVICES += cpe210-220 cpe510-520 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 2e204aa..4938f74 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