From patchwork Sun Dec 17 13:59:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849620 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Zk893jly"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TzN3GOAK"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05S03v4xz9t2Z for ; Mon, 18 Dec 2017 01:01:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=cll4c/q5Yv0zeqwk3QIg+wZlBzrBTh+jhMKcl7SsPi4=; b=Zk893jlyrZ6nGg 7cQjw2yE8h9QFbPDQnW6cgD8XwOJWt6GKFkMn9CulWGrcXlk8cfRWqexSpKFxbzwYPZGFMQT4RVDq HRdNbnZTv6oDvtWMRBawtjriOSIFZZSrH+1UrkYIUPx427C6NVQ0HqiHlmyvwPBkpLf+20jT+DQYX EV8L3QTNeGDRp6IBLFs7gFTuEW36bU8YKcO6ZLiJJOC0wWX6eDb0DjYFXLsEiro0zbH4CDlYnyq3n VMWc/ctSnbhIOU29ohx7exXBxXLrGk/bAXc4e70pYMtuv4zrxcvLqFmqt8npt/0rQfNWzbrzLwxr/ 83TdVg0mNXEDyKtFywXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUv-0002R3-2t; Sun, 17 Dec 2017 14:00:57 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUV-0001bY-9r for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:33 +0000 Received: by mail-wr0-x243.google.com with SMTP id z104so2848473wrb.2 for ; Sun, 17 Dec 2017 06:00:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ZCrQeFoboy/fjtaD67AL8gKcWDh3ZAucefzQULwWrrw=; b=TzN3GOAKrLai2ZqyD3vpq45sNRY3K7hfUFlNd1OJ/seR31Ioz072rXuF2pm0xwIIdG fTYzIcoa+BjRYGRN1AduTqFHfdSjYtpU/fl7PLIlFA5MyAjmMpDNcVDMshwo0JyX2PhM PPEloga9D7afX8wpgfbeMnOWyzK9+9XMUAXBHL46ItGtrapxzAosLvkAf9HY24rZYA5q h1kgqfXHXXnRxcqOpeI/cUxUVy6Af1BDtLeWjmX2UMFXCMij09Zw4XH37Sr3VfGyXHFG 3ZbgoKGLbbl4vUn8eMPhZn/eizaY33VnNAf4Qy9FNh1Gk7HCl7C6dygSTSSRCnsX0HWg jwgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ZCrQeFoboy/fjtaD67AL8gKcWDh3ZAucefzQULwWrrw=; b=L1iZPzvhRMbesI27kwbEv7/q4jRwsEfYO73UZIRVsWZSiKNEhprmyJWXCJKyZwe+3B lYn0d0DgheyTPEdtHJhgDfnm9uZvmuDxFwjpTQqS3XZdkdv4zklIM3HsgnkFrfrx5PaH Xa8WdVUkWah9xOPke8Q4nW2VNk3peyPflPLULuIvJVU5w28iGP2FcQ51j5hgQMV69Pbt hRel6QnwqAbXq2AU78ahWqUej/heqYulO9ji5x1WpFKwSwuL/vKBEbiUcm0tVEzqXCKt fj3l7Xkza0i/82hjwS+yV/FUwgWCIeCaswGx0rajnSnYKd0GNHjQA9EOEqPYhVyfTVgu GfVA== X-Gm-Message-State: AKGB3mJeJQ6gSJ5CZ9MWs+SY00bleDE8O+GRZc9LwxMwJX4se/zQwSYU lJBfnx/Fv8dwQZWIpif0j2ngVaMk X-Google-Smtp-Source: ACJfBou6fLk5lz1Szv73uFRo/DwWHCnrehdRtxBSYsg3RcMyK2dIPkBhH6XjQaqGyPYfm99x+ZyLJw== X-Received: by 10.223.152.178 with SMTP id w47mr16035223wrb.254.1513519203423; Sun, 17 Dec 2017 06:00:03 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id y99sm11366450wmh.0.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:01 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001lk-30 for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:53 +0100 Message-Id: X-Mailer: git-send-email 2.15.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060031_546304_8EF1B9D6 X-CRM114-Status: UNSURE ( 8.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 1/9] apm821xx: explicitly build the rootfs.img.gz target X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The commit 87b668765e1 ("image: when using the new image build code, gzip ext4 images by default") forced that all targets that select the ext4 as the root filesystem to always compress the generated rootfs. This is fine, but this method doesn't not allow to append the metadata on a per-target base. Therefore this patch changes the rootfs image production rule to generate the gzip step manually. This way the metadata can be appended at a later date. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/image/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index ee85292d57..ebc6a051cc 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -217,11 +217,11 @@ define Device/MyBookLiveDefault KERNEL := kernel-bin | dtb | gzip | uImage gzip KERNEL_INITRAMFS := kernel-bin | dtb | gzip | uImage gzip BOOT_SIZE := 8 - IMAGES := rootfs.img kernel.dtb + IMAGES := rootfs.img.gz kernel.dtb DEVICE_DTB := apollo3g.dtb FILESYSTEMS := ext4 IMAGE/kernel.dtb := export-dtb - IMAGE/rootfs.img := boot-script | boot-img | hdd-img + IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip endef define Device/MyBookLiveSingle From patchwork Sun Dec 17 13:59:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849621 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lIo5dIr8"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ok7L7bU0"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05SV4MRHz9t2Z for ; Mon, 18 Dec 2017 01:01:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=a0Ej4fl7cuMxM0pQyZPRMyzF3AKrpnPdbeAdfU64O4Q=; b=lIo5dIr8/Y1+IDBfzPCcPqO0S/ ryl2cDANuaROGAdrFIzImyTcSA4C/fIDNUPcLXUdz9wTkSejJGtwn7+c2vUuOIMpAzvHZynjOdTiD iEyc/ON3VW2bDaUVZ6zJtvqUM8OLu78vvwtc0BKiOH/FujBlAj0v/gWuKoWwbqzucsFjv3ZdXBnq0 v9JRTG4tN7Bkd38BZQLijmfx2xkKb3k8EJQPc5HuT9hXyypddrObf1ub8ENGKHDllhr+BsraqctKu i4k2QdcX1uGW+sdcMtLGSQ3LbXU1sU64n1mPMXartJRVvV0h3CDgvN/THtThGL+aaLuaEbyFvPr4G uAlgcrYQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZVZ-0002rB-Oj; Sun, 17 Dec 2017 14:01:37 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUV-0002Fg-9q for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:35 +0000 Received: by mail-wr0-x243.google.com with SMTP id v21so1114495wrc.0 for ; Sun, 17 Dec 2017 06:00:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=MjcivMrL7L5R9HaPO5y/8LsvjjsziRjRisjzOp01soM=; b=Ok7L7bU0XZOkG5KpMpbYZ4TOUq0naE4DtT/FDWvEjcnJT7anzpnhHzZCR+QRlsDWZk D1d05g3FGmI92m+Lz/860W2BBs1xWSz+N1vGdAafvP2jSp+SxYym6xcsQMXCqQcBcuGT 6NEU+9EUaSKgf5KgNTcsO6YBusMjVINWYyY4UKBPv7Chtuf1DZD05ewIKlPvC/+mHYb2 VZ11tfqvtXaut/s36jjbDv17BpQmt3MOmxi6brb/kohv7Sme2hAC+udXUNnC2H87TJtr uonXoTKY61AfeEYc4sGU9Fdc5esyQzv98Qwxu2tJZVnUDcVB1vlegYHp3pR4Jqejuz4V 6icQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=MjcivMrL7L5R9HaPO5y/8LsvjjsziRjRisjzOp01soM=; b=Pf+dgQc9j8kb/xCnt7PuMLzVAe6E8T/CAQIdTBDifZLoUcyyr+JdOnHFDyvylGH23H p7ogTNJQlFm1h9N61Rt7f2CMKJfhpvPBPxVoKUQXeUB3sP+VY3UiOjGi+P2QdOneJ1L+ kbjBFdfwLaxXmMDdVVz6t/gb8OZHWoSZe6QS6FacM7Npod1YMn8okA3mJ1OWICNuF51/ KE0oF6pEplvqnD7BjbTI564ygmfmk4Ap9ZkM762/vA6IA6kTRFjxfzq1joH7Z6KHZ1E4 PuLV0M+WsoRS6ZKJgVXZALintNqSPC3wmdzANeD3vBP4C/tqtDRfcaZPHKMt6GMukFNa b+WA== X-Gm-Message-State: AKGB3mKDfZEZSAFYRLtuib12l9ULuXniEsyzzxOV+Nkqza2OV+kPCBTS WNb2V0pvaOjNLcMiMW9iKQufgqep X-Google-Smtp-Source: ACJfBoukEjZy7BZE9EOcBcmTExA2UiTY3kK1QUDjW0+5MYjLyufNdEaflxS/e2/9pjz4hTb4ih2pzw== X-Received: by 10.223.144.201 with SMTP id i67mr13737955wri.163.1513519207094; Sun, 17 Dec 2017 06:00:07 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id 67sm10660157wmq.38.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:02 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001ln-58 for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:54 +0100 Message-Id: <92b83cdcaba958a2117194732f184436ba44c289.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060031_550915_60152EDE X-CRM114-Status: UNSURE ( 6.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 2/9] apm821xx: replace whitespace with tabs X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Christian Lamparter --- target/linux/apm821xx/base-files/etc/diag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh index e45f2a8522..26c035c6f3 100755 --- a/target/linux/apm821xx/base-files/etc/diag.sh +++ b/target/linux/apm821xx/base-files/etc/diag.sh @@ -32,7 +32,7 @@ set_state() { status_led="$upgrade" status_led_blink_preinit_regular } - ;; + ;; done) status_led_off [ -n "$running" ] && { From patchwork Sun Dec 17 13:59:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849624 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PZZ+qbcW"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RKqhPcoC"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05TH2Fr5z9t2Z for ; Mon, 18 Dec 2017 01:02:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=KrAYzx0AgBeQC1/1TnD6e04q4/6k6MtcBCSaafaBvsc=; b=PZZ+qbcW7CKtnlaQGrpJgI1UXl X2ckThSj5RbVfiZClsXxRhPIvGgbEfUvrCHYua7KbMcX8GNPHayXQ7QbXDHXkjVqrvKx2C/AAJoW9 Fy6DVnKZy9x16V7Y5uI/qo8C2YOCaDuv/m9Rts9rNi37rH04RXnMMUw+FZoHE7GgGQR7dYT+d35jv m5DdzXLn0j7SwLHaM0gqPBv7ZtxV6CklEzRkbasG1aQ1vVgB4IU5YoE9QWQTHujOlDDvv+JKNfaa9 Pl5ipHRD9bkNBHjVkRkasuV4956ceCyr+irU57kFToAWuQCtOf/zHsIw0Tdi8zu6rUW5NaIyCXycj KbrIkFpQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZWE-0003VO-7c; Sun, 17 Dec 2017 14:02:18 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUW-0002As-JQ for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:36 +0000 Received: by mail-wm0-x241.google.com with SMTP id t8so24808832wmc.3 for ; Sun, 17 Dec 2017 06:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=W67nELgOhHJrKt9UEouKeucFn2DHhzaD6agzSUUJEu0=; b=RKqhPcoCu4u8bqLgEzn/pfFNo5YB9sGtwItvRK7vMbl21uP7EhcxxtIkXyt3OEAgYd IIpDZqSxmL2OP7PiO4cNY3HCPAO929TPNBj9T/4IHMsNCGQ0QjfeMAZFfkEQwgs/E4/n y0lO/21qIyfWQVl/dCV5wX2KMqH/Sq4O1GmzgW4LMIchXnZsWwhacd19UNZ5w0bMrBY6 /Ib0etga2yRgY0n6B7d5tT4xBdeBy9208olfN+AWJNmvP6sv1b6b0qIxDZv8yzrIvVjC bQqaFj5ANFH8GzxTxXw9Ia1aVfcAEk05R8XwqrMgVBwwzNIPJ+YgjYpAB/70Z2USSBrB 3ooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=W67nELgOhHJrKt9UEouKeucFn2DHhzaD6agzSUUJEu0=; b=jMkx+hX8t0ZibaJz/RHbOmqwW1KAwCuJIbSNOmiJy+w8POVz/u7Es8GCwDFuhgwasv sZsOdoGmx+EsSEUl8S2Wef5jLMYkf3UKRIqUQuE2VzR6AJMrZJcIgJDSSfqLseymAjeu Bl9jI86VFOT0MdEuI6Bu7kgQSmb6Ro6lbXvZRTxQYlHQTirrrN5X5HtsSMH5A0tFIddo 4hZZMckWbNge+/JyHk7f1188FoLqckV5/vMZdixfDQuegKFprIo2NIiDgCYNv5eKJgqc L7OER2apZqX9v2Sm9bnINC01xeNq0Vqk8t0T/138X1Mqxj/1Ah9ayRh054RTrgV5K233 pggg== X-Gm-Message-State: AKGB3mKIPH4Y3T90xg/wmoosVUCsyPk4yHlHKejANOxzgbfy6KItzdTA P8kheoyQG1DWX5NhgVYzsOMiAoov X-Google-Smtp-Source: ACJfBovSBur7PwtbJ4JFXU/D85pSm28nrc2SBtkLEc5j7DGTu5yCu+HEBIDqaV+Wn6tWEhwP6DxFVQ== X-Received: by 10.28.211.67 with SMTP id k64mr9530687wmg.55.1513519206426; Sun, 17 Dec 2017 06:00:06 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id j77sm37639950wmf.36.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:02 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001lr-6z for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:55 +0100 Message-Id: <5ea1bc0cfd0c733f16703773dc344db0a0d836c2.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060032_806376_083C45ED X-CRM114-Status: UNSURE ( 8.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:241 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 3/9] apm821xx: replace DEVICE_{PROFILE|NAME} with BOARD_NAME X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch sets the BOARD_NAME variable on each affected apm821xx device. The existing DEVICE_PROFILE and DEVICE_NAME assignments are deprecated as they no longer serve any purpose. The BOARD_NAME variable is used by the sysupgrade-tar method to specifiy a directory overwrite for the sysupgrade-$dir directory in the generated tar file. Keeping the original boardname in this context will be necessary for targets that utilize the sysupgrade-tar method. Otherwise, sysupgrade on an previous installation will not recognize the newly generated images. This step is necessary since an upcoming patch realigns the existing shortname for a device with a proper "manufacturer_device" identifier. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/image/Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index ebc6a051cc..217bff2c59 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -5,12 +5,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DEVICE_VARS += DEVICE_PROFILE IMAGE_SIZE DTB_SIZE +DEVICE_VARS += IMAGE_SIZE DTB_SIZE define Device/Default PROFILES := Default KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts) - DEVICE_PROFILE := DEVICE_DTS := KERNEL_ENTRY := 0x00000000 KERNEL_LOADADDR := 0x00000000 @@ -61,7 +60,7 @@ endef define Build/MerakiNAND -$(STAGING_DIR_HOST)/bin/mkmerakifw \ - -B $(DEVICE_PROFILE) -s \ + -B $(BOARD_NAME) -s \ -i $@ \ -o $@.new @cp $@.new $@ @@ -70,7 +69,7 @@ endef define Device/mr24 DEVICE_TITLE := Cisco Meraki MR24 DEVICE_PACKAGES := kmod-spi-gpio - DEVICE_PROFILE := MR24 + BOARD_NAME := mr24 DEVICE_DTS := MR24 BLOCKSIZE := 63k IMAGES := sysupgrade.tar @@ -91,7 +90,7 @@ define Device/mx60 DEVICE_TITLE := Cisco Meraki MX60/MX60W DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-usb-storage block-mount - DEVICE_PROFILE := MX60 + BOARD_NAME := mx60 DEVICE_DTS := MX60 BLOCKSIZE := 63k IMAGES := sysupgrade.tar @@ -145,7 +144,7 @@ define Build/wndr4700-specialImage -$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T multi \ -C $(1) -a $(KERNEL_LOADADDR) -e $(KERNEL_ENTRY) \ - -n '$(DEVICE_PROFILE) initramfs' -d $@:$@.fakerd:$@.dtb $@.new + -n '$(BOARD_NAME) initramfs' -d $@:$@.fakerd:$@.dtb $@.new mv $@.new $@ rm -rf $@.fakerd endef @@ -157,8 +156,7 @@ define Device/WNDR4700 kmod-md-mod kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-iso8859-15 \ kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \ partx-utils - DEVICE_NAME := wndr4700 - DEVICE_PROFILE := wndr4700 + BOARD_NAME := wndr4700 DEVICE_DTS := wndr4700 PAGESIZE := 2048 SUBPAGESIZE := 512 @@ -228,7 +226,6 @@ define Device/MyBookLiveSingle $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live DEVICE_DTS := apollo3g - DEVICE_PROFILE := apollo3g endef TARGET_DEVICES += MyBookLiveSingle @@ -238,7 +235,6 @@ $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live Duo DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini DEVICE_DTS := apollo3g-duo - DEVICE_PROFILE := ap2nc endef TARGET_DEVICES += MyBookLiveDuo From patchwork Sun Dec 17 13:59:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849622 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="szOe2mcM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lVQUFuXu"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05Sl6SJsz9t2Z for ; Mon, 18 Dec 2017 01:01:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=W08+splE6hFCN6usmIelqNfdo128yg0E0MV6DlkoFec=; b=szOe2mcMbOqUjcLtWCXIazK1hB xMcUdnXX1RmipHKao1f2UP6o7nyoyO/i0gPgZ3qR8xn9cFUZ6Q4Bd7w9if5mvgqAoMMZHcDYX7tC4 VO+vKW20yWenq/UdhreeV3MyaEun1KTEWHy2ldT9prqBuxM7Mt+j3Qa2+wa25i6NnAiCQe6aL6Y/V pHnc0fnOoEUKzqe/njR+yUhqfKkTQRqZqKk56siTf3SDgj57Oc2/ZdXxx5S1KmxvJ3+WbBybSQpdE YAIoVSl1ubG3CVncxJ7RXP+Vz4LqmwhKkTQgblKTom5xNRAYxFtAEqcqtpGY4vb64HfDbToYid6Tu kmRJW9wg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZVm-00034E-JD; Sun, 17 Dec 2017 14:01:50 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUW-0001jW-JP for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:35 +0000 Received: by mail-wm0-x241.google.com with SMTP id t8so24808698wmc.3 for ; Sun, 17 Dec 2017 06:00:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=FKx+/XXD50O383V+rzMSHMHoWJPuQGiX7CXnXDKiuNU=; b=lVQUFuXuiSMnxuCluB6qlMYII9Q9AleOFDY+OmG2zrwEpoyoKD+HUn1qjV/nDSht6o 9V4VKApK0Zf3A8rUPTn5XTS2RKrnhU9uzU+vvBgfVvUTGfR4fEGQeju9gXxh6n2BN9pK pa+OpkkfnxO54VL/RhxMT9IBkV3mwUs8lr7x9IA/eE3qHy3Lf0QL5r4Dpleyr2S2Yg7U O1+8VTapAkHtvQsuKm4K/+U7LR7Z5ptgBOZW2ca1LfOU+3Z97CMlY57JbElgqqszt3bL wnfwglrJS+UoZEYqyq699aNdK/HHsF4yFjIs9Vw0DO6Oh/vFQhKgHELUESEHjiTRypUx 9VHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=FKx+/XXD50O383V+rzMSHMHoWJPuQGiX7CXnXDKiuNU=; b=WJzuBicGLgmcbIKm+0nvma0gyP2i3GNZ5HrTade4NQA7ltN6G+fCgIBk5rEsxCNVFb xPCPM2G7tELry9nPf+5ehqu+Q2PTO5tSM7C2CqKJcUIybJBytLeGBw2LkPYdRNGmijKR eNwpykKWMjtLP9cqhEoK135YTe8jr5JrlNHHf7t/JztHlZC0+5HQD5n4ZcQaEVFonq/T lNCi1BZajyqbtyc3RH5FA34mRaRwSGnOlSAsJ+uYoXzhMt2ighyiRwVKpKmMSBJD+E7L oE5rjWa8TaatTjO7/bA2zVg+tk8iPhKZwNz+KbSApIpUhwbO3IiDGoVel8uVJ56B4jA8 DooQ== X-Gm-Message-State: AKGB3mInpII6pZP/W80VH/kW4WGoMuC2P43yIDThqn4bYSkftTojEIkB 5zKXVrV5zffqSxJ6/WCCx7xeO0GX X-Google-Smtp-Source: ACJfBotN7MvzgmQVLf/EA1qHrcttJQBTY1kIvTO8rnG3InedvjGHQMN1A5rReRXnvp8Qv+/9AmVvNg== X-Received: by 10.28.11.206 with SMTP id 197mr10256288wml.3.1513519204136; Sun, 17 Dec 2017 06:00:04 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id h76sm13524074wmd.2.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:01 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001lx-8X for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:56 +0100 Message-Id: <64db29bc30a37de5d70895718042bc5aacf65c86.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060032_793965_98629864 X-CRM114-Status: GOOD ( 12.84 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:241 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 4/9] apm821xx: dts: append SoC compatible to DTS X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch appends the "apm,bluestone" or "amcc,apollo3g" machine compatible string to the current device tree source. Please note that unlike other archs the PPC DT code does not regard the machine's compatible string as a priority list. This is explained in the kernel's usage-model.txt as follows: "PowerPC uses a slightly different scheme where it calls the .probe() hook from each machine_desc, and the first one returning TRUE is used. However, this approach does not take into account the priority of the compatible list, and probably should be avoided for new architecture support." For this reason, the "apm,bluestone" compatible string can't be added to the WNDR4700. As otherwise the target specific pci fix-up code will get ignored and this causes the ath9k WIFI to not get initialized. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/MR24.dts | 2 +- target/linux/apm821xx/dts/MX60.dts | 2 +- target/linux/apm821xx/dts/apollo3g-duo.dts | 1 + target/linux/apm821xx/dts/apollo3g.dts | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts index 75bb32255c..8b58ce1991 100644 --- a/target/linux/apm821xx/dts/MR24.dts +++ b/target/linux/apm821xx/dts/MR24.dts @@ -16,7 +16,7 @@ / { model = "Meraki MR24 Access Point"; - compatible = "meraki,ikarem"; + compatible = "meraki,ikarem", "apm,bluestone"; aliases { serial0 = &UART1; diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/MX60.dts index 6c753639b2..64c8540d4d 100644 --- a/target/linux/apm821xx/dts/MX60.dts +++ b/target/linux/apm821xx/dts/MX60.dts @@ -16,7 +16,7 @@ / { model = "Meraki MX60/MX60W Security Appliance"; - compatible = "meraki,buckminster"; + compatible = "meraki,buckminster", "apm,bluestone"; aliases { serial0 = &UART1; diff --git a/target/linux/apm821xx/dts/apollo3g-duo.dts b/target/linux/apm821xx/dts/apollo3g-duo.dts index 53459b0cc0..4f6cc506f5 100644 --- a/target/linux/apm821xx/dts/apollo3g-duo.dts +++ b/target/linux/apm821xx/dts/apollo3g-duo.dts @@ -14,6 +14,7 @@ #include "apollo3g.dtsi" / { + compatible = "wd,mybooklive-duo", "amcc,apollo3g"; model = "MyBook Live Duo"; }; diff --git a/target/linux/apm821xx/dts/apollo3g.dts b/target/linux/apm821xx/dts/apollo3g.dts index 4d31edae4a..d841352292 100644 --- a/target/linux/apm821xx/dts/apollo3g.dts +++ b/target/linux/apm821xx/dts/apollo3g.dts @@ -12,5 +12,6 @@ #include "apollo3g.dtsi" / { + compatible = "wd,mybooklive", "amcc,apollo3g"; model = "MyBook Live"; }; From patchwork Sun Dec 17 13:59:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849626 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VCmOjYjI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PoQYUcp6"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05Tp0jCwz9t2Z for ; Mon, 18 Dec 2017 01:02:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Eq2pqOBFJCF8Snuj/+9DlsxfEBUJNx6CKkEUpqPgSz8=; b=VCmOjYjIp4WjfqFqd4Z/Hzgwhq q5n2UpReI/5Ti0T7Qn78OK7lUF8wHtnT14kV9FABAIAF9Jp5ouWX8M/yLHlFp6G2P7kLXYpKuEhYe vJGQtElFJFrSBXAG8ESE2gSNN779G7UNydgkvgIn57S1Gomj3ZqN9PfYiw40KzfZMniiXtwluZvtC mVjW5y1AhDNem+vmmkTtrjwKPlN3iOSaQ8rJ28PChn9NO3eSEzsevaNGVYuWmdo8xJoqIwYBtHpXV 7KNu/zX8Q6KvOMkmRWF20y4mvMOwiCyGkliDd58oYNq3jMnDUPMMrIUpSSCdy49OirWzV6IFHhqcV 4f8OyOAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZWf-0003wP-Mx; Sun, 17 Dec 2017 14:02:45 +0000 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUY-00022u-HY for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:37 +0000 Received: by mail-wr0-x244.google.com with SMTP id q9so11803846wre.7 for ; Sun, 17 Dec 2017 06:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=9fQQLla3Ah0L+k3wdqMs9XWC/ON3b9QoyTTnKketvxQ=; b=PoQYUcp6FvvveOGKTZJqWFKbCaSVEwNXRLz6c3pYMAG2QTqaIweHUeYoh42YBx3qju 7BTYpxnna+uxh9xrws2CU4pOlwOzPCVaRSUAYOrtpU+iqpbfY79uJoZF+AxT0lRTGuD3 FcffttVY4cR+kRoAVfoOvLdzIYjpQP9paiddwG8TSMtf8g9U8OkEmgDBKAQy8Xj5JtUl nB0os0OzzX3qhw8T5IJ8/3ZVYmWiX6AxLJrvPth60gVRhVD9MSXp1WO4wMowObXc/JIf aVSln++QAPYkDuvET5Tkdb+hOxVgAwOdHvFOKGYfax5OHjxYFdx4ehINzk6SxIajze7c BjIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=9fQQLla3Ah0L+k3wdqMs9XWC/ON3b9QoyTTnKketvxQ=; b=mTcse9cP2TxmDupYor+vsO+l4i6ADylUEqM4qy7skLmrnkDAuPWX2wuSNbjWmKl3p2 va4EudYq/5l5m8OIP+9LO91arW2vLUfngWDCGMyOwou02DgPvXKe7yGBC6JQ5rjAAkDr UZwATCeJ12qgkbmshuSDDJT2h0A/vvzAMEOr2+o/1fP4DrAp7mhWTVETnvJmZraouvq7 gOL5IKHKCk3hOeAIECYuhoQq7zqxfFMUQWDEXLCE8Pt+OZ1MX0g8tnSNlyDlMO/hIZ65 f6LHm4dofoZVTueDCJ5MAaOXTIRG3Qs+jH9axeJEYP6SpyhzLZd7lbdNHDuKCsifVpD7 Rzrw== X-Gm-Message-State: AKGB3mLpafeRziEl2rXT8Yq/a4uBS4xWLlgneVVvfZgS4nufPy7ST01k t6sY1DWjIxQKVpPTZ2/JjMPunXKK X-Google-Smtp-Source: ACJfBotfeVAF+2imtxjlXysGzuo1YSpOusfDlMHRg86/DEmIATykJoHzwCCmEIubOEpL/afP3mCszA== X-Received: by 10.223.151.212 with SMTP id t20mr15771921wrb.2.1513519205812; Sun, 17 Dec 2017 06:00:05 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id l25sm16550136wmi.35.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:02 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001m2-A2 for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:57 +0100 Message-Id: <23a349f371d973f95bb28db56b131886f955505e.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060034_741294_7C44AA50 X-CRM114-Status: UNSURE ( 8.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:244 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 5/9] apm821xx: add product names to the dt compatible for Meraki X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Meraki choose to use their product's codename as the main compatible string. Mathias Kresin commented that this is a poor choice as this will confuse the users and devs once the device-tree compatible is used for board-detection and possible the image name. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/MR24.dts | 2 +- target/linux/apm821xx/dts/MX60.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts index 8b58ce1991..2c2f8d281b 100644 --- a/target/linux/apm821xx/dts/MR24.dts +++ b/target/linux/apm821xx/dts/MR24.dts @@ -16,7 +16,7 @@ / { model = "Meraki MR24 Access Point"; - compatible = "meraki,ikarem", "apm,bluestone"; + compatible = "meraki,mr24", "meraki,ikarem", "apm,bluestone"; aliases { serial0 = &UART1; diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/MX60.dts index 64c8540d4d..32e5c859e8 100644 --- a/target/linux/apm821xx/dts/MX60.dts +++ b/target/linux/apm821xx/dts/MX60.dts @@ -16,7 +16,7 @@ / { model = "Meraki MX60/MX60W Security Appliance"; - compatible = "meraki,buckminster", "apm,bluestone"; + compatible = "meraki,mx60", "meraki,buckminster", "apm,bluestone"; aliases { serial0 = &UART1; From patchwork Sun Dec 17 13:59:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849619 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XOe8OSvh"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UID0I0vW"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05Rv1HbPz9t2Z for ; Mon, 18 Dec 2017 01:01:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=vQZSgzOyydqZWtrhcSZw+bPU2bRJgv0biERdGVs01nI=; b=XOe8OSvhhWLaZpweMdoCyEKEhJ dKvG9MV2K2QFs0YF+soPwCHTTe1xPciSuGgGYVjLxRJRpsrgBE5f8jdNBltnVAzI4c1S1vrZbhiLg Tn1TSIK575vy9dvA48o1aW82c/bX10MsszBlJw7EDKRsYLbfMuVJlEYkaFBLRcg5UR/060nB9rOJ2 frvSOr2VOI4ntlAlu5qp4YusExpBiCnjf9Jde+kBu34Fikok9ECpoHRR6twdN1Lx0m0jPNZ93zDeI ciz23CYqF9X0+s5kG7ndPWR1Z9oXLJ5lVshwpJ0l33K+vnJTy8X0mqgO1euImy98CrMRbOYqxEKiw ckDcsyGA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZV4-0002bE-AM; Sun, 17 Dec 2017 14:01:06 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUV-0001r2-9p for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:33 +0000 Received: by mail-wr0-x242.google.com with SMTP id o2so11795931wro.5 for ; Sun, 17 Dec 2017 06:00:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=qeqhl+Dq/ozeCJ9eC4iMHNeXLY2OCPpdHiP+yzSQs+U=; b=UID0I0vW02OLSb09A48QszxB0kLIxbEA65AqBQ9bgIawZ7nqQ3W1TpoqbolG+fkuUk EwK4N1fWLNgvkI7xpWSdNtOzm6zBYmQgmN6M9myz9YrF3QbaN6kYuActbdv04oeybj08 nOntIYdIthOx/1hva16o9VFlaTG6SechWLnwb5G9iBzaUaISuAng9CmjlcXcfq7Fduh0 NfWEGNRgXiIbnrljOXkECMLQQ6P11n2viDbDCj2TkBExhOffBFqQ7bI4Os8hd+OmZWOu x7wb/3asjEhnY8fpcO966FvRea24StuTmKS19TkvYiG8RgxPEXaNnwlnjWxMoX7CtsEO qEyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=qeqhl+Dq/ozeCJ9eC4iMHNeXLY2OCPpdHiP+yzSQs+U=; b=k6dh85QLkf2mQJqspV+q2/PKto3jj6Su20ur33vmTt8AIPna9LQ3QL3WYvgXHeCfxA KB73PuetnD2i4iytcy80kup24nFA33LgS0NFFpNqjBYuDiuw099v/gTi5lClOzjratT5 RF4S4BUelhZSccxQDN/J3HkVY5hexH0V82ezrE70BDPZ6zoALTIsqUxAotrow5u0DYyO LHuF0FUm5Z8u16wJQQInc5R+z2SSIOuINHJSoGN5mLHk+j+dHouMIHRW45kpDyPHyVRN ehZT3ufgfwayPSR8Cw5rjRfhGu3DstESptjrQl0o/lMp070f0CE1L/xBXqXAUVdq530M SaFQ== X-Gm-Message-State: AKGB3mL/22PSLNdMavfbV9DAcU4Fbm2fVekwwKmlDAjMV1cnwRKUaXhU aEp3fBd+BYscFQU1j2qaoSMk35nG X-Google-Smtp-Source: ACJfBovRBt40UOO4SgkzbNi5Pa8eUreahq+Mr7iX1R4L2ZUlPG3NYVeu84QFC6gcO8t33kXYVbtz6g== X-Received: by 10.223.175.199 with SMTP id y7mr14614500wrd.207.1513519204873; Sun, 17 Dec 2017 06:00:04 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id q74sm12394400wmg.22.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:02 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001m7-BW for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:58 +0100 Message-Id: <219f4f00e2e2ca810c4a49470699f5aa5d80b852.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060031_545877_39C82A6C X-CRM114-Status: UNSURE ( 7.33 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:242 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 6/9] apm821xx: dts: rename devices dts files to include the manufacturer X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch rename all the DT source files in order to match upstream's "manufacturer-device.dts" format. Please note that the DEVICE_DTB isn't changed. This is because the u-boot of the MyBook Live defines the fdt_file variable to be "apollo3g/apollo3g.dtb". Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/{MR24.dts => meraki-mr24.dts} | 0 target/linux/apm821xx/dts/{MX60.dts => meraki-mx60.dts} | 0 .../linux/apm821xx/dts/{wndr4700.dts => netgear-wndr4700.dts} | 0 .../apm821xx/dts/{apollo3g-duo.dts => wd-mybooklive-duo.dts} | 0 target/linux/apm821xx/dts/{apollo3g.dts => wd-mybooklive.dts} | 0 target/linux/apm821xx/image/Makefile | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename target/linux/apm821xx/dts/{MR24.dts => meraki-mr24.dts} (100%) rename target/linux/apm821xx/dts/{MX60.dts => meraki-mx60.dts} (100%) rename target/linux/apm821xx/dts/{wndr4700.dts => netgear-wndr4700.dts} (100%) rename target/linux/apm821xx/dts/{apollo3g-duo.dts => wd-mybooklive-duo.dts} (100%) rename target/linux/apm821xx/dts/{apollo3g.dts => wd-mybooklive.dts} (100%) diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts similarity index 100% rename from target/linux/apm821xx/dts/MR24.dts rename to target/linux/apm821xx/dts/meraki-mr24.dts diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts similarity index 100% rename from target/linux/apm821xx/dts/MX60.dts rename to target/linux/apm821xx/dts/meraki-mx60.dts diff --git a/target/linux/apm821xx/dts/wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts similarity index 100% rename from target/linux/apm821xx/dts/wndr4700.dts rename to target/linux/apm821xx/dts/netgear-wndr4700.dts diff --git a/target/linux/apm821xx/dts/apollo3g-duo.dts b/target/linux/apm821xx/dts/wd-mybooklive-duo.dts similarity index 100% rename from target/linux/apm821xx/dts/apollo3g-duo.dts rename to target/linux/apm821xx/dts/wd-mybooklive-duo.dts diff --git a/target/linux/apm821xx/dts/apollo3g.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts similarity index 100% rename from target/linux/apm821xx/dts/apollo3g.dts rename to target/linux/apm821xx/dts/wd-mybooklive.dts diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 217bff2c59..6efd3886d2 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -70,7 +70,7 @@ define Device/mr24 DEVICE_TITLE := Cisco Meraki MR24 DEVICE_PACKAGES := kmod-spi-gpio BOARD_NAME := mr24 - DEVICE_DTS := MR24 + DEVICE_DTS := meraki-mr24 BLOCKSIZE := 63k IMAGES := sysupgrade.tar DTB_SIZE := 64512 @@ -91,7 +91,7 @@ define Device/mx60 DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-usb-storage block-mount BOARD_NAME := mx60 - DEVICE_DTS := MX60 + DEVICE_DTS := meraki-mx60 BLOCKSIZE := 63k IMAGES := sysupgrade.tar DTB_SIZE := 64512 @@ -157,7 +157,7 @@ define Device/WNDR4700 kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \ partx-utils BOARD_NAME := wndr4700 - DEVICE_DTS := wndr4700 + DEVICE_DTS := netgear-wndr4700 PAGESIZE := 2048 SUBPAGESIZE := 512 BLOCKSIZE := 128k @@ -225,7 +225,7 @@ endef define Device/MyBookLiveSingle $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live - DEVICE_DTS := apollo3g + DEVICE_DTS := wd-mybooklive endef TARGET_DEVICES += MyBookLiveSingle @@ -234,7 +234,7 @@ define Device/MyBookLiveDuo $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live Duo DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini - DEVICE_DTS := apollo3g-duo + DEVICE_DTS := wd-mybooklive-duo endef TARGET_DEVICES += MyBookLiveDuo From patchwork Sun Dec 17 13:59:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849623 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VNYlZk+F"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mW7+aPJs"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05Ss3qHxz9t2Z for ; Mon, 18 Dec 2017 01:02:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=fSg7jWFoNtmGB0g6p2wmh6syoMW1f0izJ0oKh5tZMMc=; b=VNYlZk+F/2vVLDJAXn23F7eih6 sV+iElwhRaL7b/60PpFbiSixkj4QXAkhD0yrY/sh9dSBOK/gHAlBM+F3aP1m11cKinZEAwRfy8yCQ sAoMZ7tz9Lj4zT4iwrv4eMEJNRMMBcO+gXRxSpJKejijI/v5FYOA63w8Z/CIrxABzSnnEzH/38Cun 6oLtroKonc8+mJW2W3uN752AK3mXV9p5It61AVSAdD5TFyb4QP2e/z3OA1lYFKFky5/KBiYzpEdQu CxDV99xgSeoEcOgX1auvDzA8dofGuEUuyWQcSg2UjiDCqiD2ojLDaCikSNcvxIQLC8TGYX7ESgcNP EWrTm9fg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZVz-0003He-Pj; Sun, 17 Dec 2017 14:02:03 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUV-0002MZ-9r for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:35 +0000 Received: by mail-wr0-x242.google.com with SMTP id q9so11803902wre.7 for ; Sun, 17 Dec 2017 06:00:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=Rhk/s4uDF4tUfNlafqOggBeUzr1oAC9MT+/g2eyoLys=; b=mW7+aPJsJDDZ6kUod1EapRmCQa1JDJq/v34RROllpvTFpAM63Nf9HHejurqcMclmNK QUV/S8wMqK3sOWxmT3tSSsveoKV3f8bi7OgeKNeynAIilCHpBn5L6MaWah3C/Dyx9UAg Co8l0lJ6hpGcCl5lrY4KK2RIeDhEK6l/zdFuFjOh+/I+eqUb7pQj4SGuGxZ/p8p4rp2v CRDJtmwh6UK2m3kkkKnQaPLE/ZrsRXzng9ZOaKvE/2kPDq5TLQjYFGPJgX1zqSjiHvkW Pmd/vEkzxCyMm35Yypvw9PFghF+VeX622f+ga0NTZFzz/Ql+uweSnl2Eg6qxrMYM+vHe nNow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Rhk/s4uDF4tUfNlafqOggBeUzr1oAC9MT+/g2eyoLys=; b=tYEYJg84nC9D6uNsjl9147mHXAEI5CdOq69HsmIcL+lH0nF9f8UVOSq9r1Mq1KMgcn 73AiStAP6NaExawBrUIFszw2AsPosyIcgs+PV9IOq7/DRXUgL8TnclYEaKjamM3Hs8N0 3pT88tGo1tuDFuYZH24LlmJUwR8QlCtYYtyhulSddqYQnAZke9O58uk3hMBf4aZbvT3S p+gk+36A2E/8Y2ZL3NzykR58kAnD9wrzG44vF9LmACiO3Q+sn7cgG6fZpae2H21pw7qF 6bIcavxDrqFqY817qArBIsHBPKt4n8OnijL1fqija1F3tmCD93Jg3e4Aab6ue4E0uBAI ET/w== X-Gm-Message-State: AKGB3mLyNIvrxlyKq8KLn9x2xcOZo0JoPVpNSthauNZTLjI54aq0uYnk FF5EOxztABcx7guQOJjYoROZ0AqB X-Google-Smtp-Source: ACJfBos1nL8BXd0tChj+iiZzCDvQnZC+m/KbZeWO/e+P7MHqO5FkpBlpy0WJUagbPGwWc378Gbf9yw== X-Received: by 10.223.196.71 with SMTP id a7mr1460683wrg.158.1513519207893; Sun, 17 Dec 2017 06:00:07 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id u5sm3724520wmf.47.2017.12.17.06.00.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:02 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001mC-DP for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 14:59:59 +0100 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060031_549666_87AB2EDA X-CRM114-Status: UNSURE ( 7.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:242 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 7/9] apm821xx: align device names with vendor_device format X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Currently, the device name handle does not include the manufacturer. This can make it hard do differentiate between products from different vendors that have the same product name. As the handle is used to derive the image name. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/image/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 6efd3886d2..bff3947039 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -66,7 +66,7 @@ define Build/MerakiNAND @cp $@.new $@ endef -define Device/mr24 +define Device/meraki_mr24 DEVICE_TITLE := Cisco Meraki MR24 DEVICE_PACKAGES := kmod-spi-gpio BOARD_NAME := mr24 @@ -84,9 +84,9 @@ define Device/mr24 IMAGE/sysupgrade.tar := sysupgrade-tar UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += mr24 +TARGET_DEVICES += meraki_mr24 -define Device/mx60 +define Device/meraki_mx60 DEVICE_TITLE := Cisco Meraki MX60/MX60W DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-usb-storage block-mount @@ -109,7 +109,7 @@ define Device/mx60 IMAGE/sysupgrade.tar := sysupgrade-tar UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += mx60 +TARGET_DEVICES += meraki_mx60 define Build/create-uImage-dtb # flat_dt target expect FIT image - which WNDR4700's uboot doesn't support @@ -149,7 +149,7 @@ define Build/wndr4700-specialImage rm -rf $@.fakerd endef -define Device/WNDR4700 +define Device/netgear_wndr4700 DEVICE_TITLE := Netgear Centria N900 WNDR4700/WNDR4720 DEVICE_PACKAGES := badblocks block-mount e2fsprogs \ kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-usb-ledtrig-usbport \ @@ -176,7 +176,7 @@ define Device/WNDR4700 NETGEAR_HW_ID := 29763875+128+256 UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += WNDR4700 +TARGET_DEVICES += netgear_wndr4700 endif @@ -222,22 +222,22 @@ define Device/MyBookLiveDefault IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip endef -define Device/MyBookLiveSingle +define Device/wd_mybooklive $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live DEVICE_DTS := wd-mybooklive endef -TARGET_DEVICES += MyBookLiveSingle +TARGET_DEVICES += wd_mybooklive -define Device/MyBookLiveDuo +define Device/wd_mybooklive_duo $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live Duo DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini DEVICE_DTS := wd-mybooklive-duo endef -TARGET_DEVICES += MyBookLiveDuo +TARGET_DEVICES += wd_mybooklive_duo endif From patchwork Sun Dec 17 14:00:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849627 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CF3d11Jc"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IOWSGhsS"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05Ty2mPMz9t2Z for ; Mon, 18 Dec 2017 01:03:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=az554RobHKXK35ew7m7xbM71LvMVXBtkohA1NY6GFLU=; b=CF3d11JcD+LpDy eCcv7j7YDb9I2MOXiYqpWJfIXiKzUTDbHcTGufKs7jpZvVwasccysD8dpG+iTD0BlGdmDbEbz9drJ PIXacW9gT8/ggO7m2uUsi6JsJpyMBzanmhnwapkZI1Pwuyc1dSqlatwBIapcPa8IwOT79xXp7xYsY DPgVvAxrHOTF/JGUcl+nqZBpg8QrDNSb9HZ2XZcREFGhKhvVXQfTVLFduYfcKdU4obxGVl86O+MvW VmoyQH7dTafx6dQ9Kh6ysI2PyyNkUUP9tVcw7ryIkBfb1YlJF5O1ofGpK/BE94k6gTgWPznRGRQ8J BI+XYaei8kCHwYz3IUIA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZWu-0004AW-Q9; Sun, 17 Dec 2017 14:03:00 +0000 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUY-0002Mj-HW for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:38 +0000 Received: by mail-wr0-x244.google.com with SMTP id w95so911350wrc.11 for ; Sun, 17 Dec 2017 06:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=TR7raDyBFcSLH05DWNJGHc2PwclkU0AGZNon5ULhtmU=; b=IOWSGhsSaHnqnJvLy4285S3Oc1ua3ctQXS4v1MkZdTqF7kNflaJeOq/sXFXuucYWe9 X1Yd6UJdzk/g1Bq/rhznEcyHnSnH5HpsiZM6Q1eTJj/Y4X99SuINA4Y4U472fzACnDCA C0aH1ojmn3ivsFYSxdjoEMxtCnivXtERw7uipk5ti+RQTxLwryA29XYyr3ah8T93W10S fVSG3ZZLXiVojuoucTDYLdrBhQBuuHoO6XHE0zJvei29TtozJyLsDdcVWK4SobMun8wx 7ni+VQj76ci9wd2pRZ1BSMEweNg12OETYIUpQdllDHMiKoRJrtfvWZFN7pAK4iAPbq7E wZJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=TR7raDyBFcSLH05DWNJGHc2PwclkU0AGZNon5ULhtmU=; b=WHfuB0fM8N/vgBQmaNY2Dx/25HDMySrHDaM2G9c3wr0Q6hBsmes296FJZ5jT7w6233 EABMpctENr6xFuVjy7p6zcrXPlBlI0KSZHxfdeomGV5+GMlgV3jpev1kGJZFBwTdrDTv Xaww5QMTklPcxPSQd9RmaLIHOGGfBUNA/NqnphrE7vVh6pg0Z6DLP1kZvtacs9NmThc9 uGe+S4ajqwGyAFYWLbk5DhQwCtZybrIIi69Riy58AvnBTYJ8L3Ep29OcQcV0IIY7vqmp FaDyB5meLA0jysE7rVFjWIxpvDWlRbVz2QFbqJCWFHsPTsm+NR3dgxM63Yr2scvIsetD 9X/g== X-Gm-Message-State: AKGB3mIbslBRN53Duc07V7yCuly5eBN6rH7x/f84let+52Y/tHI2rvq5 SgRGhwzHzwx+P41l5OSS7AQZYBXv X-Google-Smtp-Source: ACJfBousLDecdXJRP3AxJEj7VdJWmu4hXSAN+DAKnmidEauZrJnKKxmjUGLOnwzQKdrkdVZdGufkHw== X-Received: by 10.223.169.135 with SMTP id b7mr14112313wrd.171.1513519208812; Sun, 17 Dec 2017 06:00:08 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id o98sm8565951wrb.40.2017.12.17.06.00.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:03 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001mH-Ex; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 15:00:00 +0100 Message-Id: <4a2fcf1e56ff3f8dd84399788c66e13dea0e7c04.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060034_886496_3842538B X-CRM114-Status: GOOD ( 10.56 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:244 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 8/9] apm821xx: enable metadata for packaging X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathias Kresin MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch enables metadata-supported image verification for all apm821xx supported devices. Since this method comes with a built-in image verification tool (fwtool), the previous image checks can be removed. Signed-off-by: Mathias Kresin Signed-off-by: Christian Lamparter --- .../apm821xx/base-files/lib/upgrade/merakinand.sh | 68 ---------------------- .../apm821xx/base-files/lib/upgrade/platform.sh | 15 ++--- target/linux/apm821xx/image/Makefile | 9 +-- 3 files changed, 9 insertions(+), 83 deletions(-) delete mode 100755 target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh diff --git a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh b/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh deleted file mode 100755 index fb961b8945..0000000000 --- a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2016 Chris Blake -# -# Custom upgrade script for Meraki NAND devices (ex. MR24) -# Based on merakinand.sh from the ar71xx target -# -. /lib/apm821xx.sh -. /lib/functions.sh - -merakinand_do_kernel_check() { - local board_name="$1" - local tar_file="$2" - local image_magic_word=`(tar xf $tar_file sysupgrade-$board_name/kernel -O 2>/dev/null | dd bs=1 count=4 skip=0 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"')` - - # What is our kernel magic string? - case "$board_name" in - "mr24"|\ - "mx60") - [ "$image_magic_word" == "8e73ed8a" ] && { - echo "pass" && return 0 - } - ;; - esac - - exit 1 -} - -merakinand_do_platform_check() { - local board_name="$1" - local tar_file="$2" - local control_length=`(tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null` - local file_type="$(identify_tar $2 sysupgrade-$board_name/root)" - local kernel_magic="$(merakinand_do_kernel_check $1 $2)" - - case "$board_name" in - "mr24"|\ - "mx60") - [ "$control_length" = 0 -o "$file_type" != "squashfs" -o "$kernel_magic" != "pass" ] && { - echo "Invalid sysupgrade file for $board_name" - return 1 - } - ;; - *) - echo "Unsupported device $board_name"; - return 1 - ;; - esac - - return 0 -} - -merakinand_do_upgrade() { - local tar_file="$1" - local board_name="$(board_name)" - - # Do we need to do any platform tweaks? - case "$board_name" in - "mr24"|\ - "mx60") - nand_do_upgrade $1 - ;; - *) - echo "Unsupported device $board_name"; - exit 1 - ;; - esac -} diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index 8c716bf44e..ecfd70b9ee 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -1,6 +1,7 @@ #!/bin/sh PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 platform_check_image() { local board=$(board_name) @@ -14,14 +15,9 @@ platform_check_image() { ;; mr24|\ - mx60) - merakinand_do_platform_check $board "$1" - return $?; - ;; - + mx60|\ wndr4700) - nand_do_platform_check $board "$1" - return $?; + return 0; ;; *) @@ -37,10 +33,7 @@ platform_pre_upgrade() { case "$board" in mr24|\ - mx60) - merakinand_do_upgrade "$1" - ;; - + mx60|\ wndr4700) nand_do_upgrade "$1" ;; diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index bff3947039..251ef5f359 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -14,6 +14,7 @@ define Device/Default KERNEL_ENTRY := 0x00000000 KERNEL_LOADADDR := 0x00000000 DEVICE_DTS_DIR := ../dts + SUPPORTED_DEVICES = $$(BOARD_NAME) endef define Build/dtb @@ -81,7 +82,7 @@ define Device/meraki_mr24 check-size $$(KERNEL_SIZE) | \ MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \ MerakiNAND - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += meraki_mr24 @@ -106,7 +107,7 @@ define Device/meraki_mx60 check-size $$(KERNEL_SIZE) | \ MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \ MerakiNAND - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata UBINIZE_OPTS := -E 5 endef TARGET_DEVICES += meraki_mx60 @@ -170,7 +171,7 @@ define Device/netgear_wndr4700 KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip IMAGE/factory.img := create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \ netgear-dni | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.tar := sysupgrade-tar + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata IMAGE/kernel.dtb := export-dtb | uImage none NETGEAR_BOARD_ID := WNDR4700 NETGEAR_HW_ID := 29763875+128+256 @@ -219,7 +220,7 @@ define Device/MyBookLiveDefault DEVICE_DTB := apollo3g.dtb FILESYSTEMS := ext4 IMAGE/kernel.dtb := export-dtb - IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip + IMAGE/rootfs.img.gz := boot-script | boot-img | hdd-img | gzip | append-metadata endef define Device/wd_mybooklive From patchwork Sun Dec 17 14:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 849625 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rIu8tBjY"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Zk+pXWdo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z05TP43TVz9t2Z for ; Mon, 18 Dec 2017 01:02:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d9PCJ7ABB3SnGQGjwwLO/9unOq16yhM79Ss9/agv6q0=; b=rIu8tBjYf7RtVx vjRdq9/0/DlkccfBdLw0cARLj/nrd8n21j+FG5GccWNZ4i+SP5NYVI9yL+j/OPGdqS8+Slfz/fQKA AEIZ3aw+f9r4YIBrZYxPchTQOJIvQcYh9YJJo1W1FSUiWT+COtJPj8yu47fl243jeXkSz49USVtY3 pyp2ybwUTcodwwUIHp/IsMjV0JTzVs5QxmTp3j+S2AkLpZHsJVUT3bUpdr3o6QTeq8bZ2ZkbxF3fc /gTSdz6TxIPxvw60bcDRoAKN8bs0drUUyGoU4gVo/Xg5XxQN5tQ5u4k4CirphOxEWEe1RHj9Xnegl 1cTXxgL2XZloKW95bKww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQZWS-0003jd-0z; Sun, 17 Dec 2017 14:02:32 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQZUW-0002Mn-V7 for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 14:00:36 +0000 Received: by mail-wm0-x22e.google.com with SMTP id 9so24801379wme.4 for ; Sun, 17 Dec 2017 06:00:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Y07q7Ygh89Av304sbEdglGoTU1fex0RS0DGC0sB9wRQ=; b=Zk+pXWdotXTwi/yNEE8ThWwwMVjBYOdAqdLC4PBjK9pxh/r3NpRnE0yULSYk6VboKo NNJy3t6L73xgWf6hTeFE2JffrCFqkPsVcHf1ATqflZXn/PuRGkfkLs8jI+yjILRTI/Wj IAtxYcdbL1ORKEY4jsqTdAP8qOK/g1mpQ+9xEdCxH742V9baoONf9nvv/0IHEbvoSz9c 4al7taQSmZLTO2HjgX9gsn67NHjugDw+YAd1TXAcVgfVx+KtJ04MZm/oyPCCmGk/rYdV JkiBn3xvBWuAQsndlrkygLDC/PQnXPTNYYQlBGesJbd96hwuVxkSPll2zrhYzlFMCRLf ja1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Y07q7Ygh89Av304sbEdglGoTU1fex0RS0DGC0sB9wRQ=; b=fPSKPDKl8GplBp+MNvQjcKPMXlxvLxcDPvrBc9cCj4d/FmGiW66rArXKzh6edTX2Fr V0WtgHCFfkfa73I/5hyaJHx0TdWHbevI7i38XnfNTy4p6UUHTqs8k82Kw5wSX+4X/Hx6 fa6dQwU05/+FOg1/eNhMEaabg776rqKdfJBV7OHeKR8VuQiecJqOCVeSK/fFRRuPew3Z pw8o8pRtgl0JieykbCvoDUW4BaeXJgD5qUdWURAy9v7+2Aeg4Zx46DNNgxGAeUU9D1Lc oGX6cpKL0iIOT4GG0BDQ5KXKhnDUg1p+nf0LXfI/bomYIEgj4j5d4eAwsrIPd7pjrZa3 g1lA== X-Gm-Message-State: AKGB3mISXroZBjF1JuY7xWjbA84X/1h3daxj9Ahz5Fqr7Q2bOBoQw3Cy R7SfJfI0frzwVoj852RohIUVraG3 X-Google-Smtp-Source: ACJfBovk1BWFkMYhyKhEZqL3XPSUpbGhSpZQiUgI2IzbZYdmd8tg8Kmga+7047+v/7pFbgj284KCgg== X-Received: by 10.28.245.6 with SMTP id t6mr9342109wmh.76.1513519209556; Sun, 17 Dec 2017 06:00:09 -0800 (PST) Received: from debian64.daheim (p200300D5FBDD4AFC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbdd:4afc::830]) by smtp.gmail.com with ESMTPSA id g92sm12793299wrd.72.2017.12.17.06.00.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Dec 2017 06:00:03 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.90_RC4) (envelope-from ) id 1eQZU1-0001mM-GX; Sun, 17 Dec 2017 15:00:01 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Sun, 17 Dec 2017 15:00:01 +0100 Message-Id: <1ba6482ce5f8cf1eeacd192f333b0f2b603cf4ce.1513455854.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171217_060033_401317_CC68EEE4 X-CRM114-Status: GOOD ( 11.50 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22e listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 9/9] apm821xx: convert to device-tree board detection X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathias Kresin MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch converts all apm821xx devices to the device-tree board-detection method. All instances of the legacy boardnames (mbl,mr24,...) are converted to "vendor,device" identifier. The custom board-detection code in apm821xx.sh is removed as it no longer serves any purpose. Signed-off-by: Mathias Kresin Signed-off-by: Christian Lamparter --- .../linux/apm821xx/base-files/etc/board.d/01_leds | 9 +++-- .../apm821xx/base-files/etc/board.d/02_network | 9 +++-- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 +- target/linux/apm821xx/base-files/lib/apm821xx.sh | 43 ---------------------- .../lib/preinit/01_preinit_do_apm821xx.sh | 9 ----- .../lib/preinit/05_set_iface_mac_apm821xx | 4 +- .../lib/preinit/05_set_preinit_iface_apm821xx | 2 - .../apm821xx/base-files/lib/preinit/79_move_config | 18 ++++++--- .../apm821xx/base-files/lib/upgrade/platform.sh | 21 ++++++----- target/linux/apm821xx/image/Makefile | 2 +- 10 files changed, 39 insertions(+), 82 deletions(-) delete mode 100755 target/linux/apm821xx/base-files/lib/apm821xx.sh delete mode 100644 target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds index 3b5fb721ae..c218efa49b 100755 --- a/target/linux/apm821xx/base-files/etc/board.d/01_leds +++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds @@ -7,7 +7,7 @@ board_config_update board=$(board_name) case "$board" in -mr24) +meraki,mr24) ucidef_set_led_netdev "wan" "WAN" "mr24:green:wan" "eth0" ucidef_set_led_wlan "wlan1" "WLAN1" "mr24:green:wifi1" "phy0assoc" ucidef_set_led_wlan "wlan2" "WLAN2" "mr24:green:wifi2" "phy0assoc" @@ -15,7 +15,7 @@ mr24) ucidef_set_led_wlan "wlan4" "WLAN4" "mr24:green:wifi4" "phy0tpt" ;; -mx60) +meraki,mx60) ucidef_set_led_switch "wan" "WAN" "mx60:green:wan" "switch0" "0x20" ucidef_set_led_switch "lan1" "LAN1" "mx60:green:lan1" "switch0" "0x10" ucidef_set_led_switch "lan2" "LAN2" "mx60:green:lan2" "switch0" "0x08" @@ -23,11 +23,12 @@ mx60) ucidef_set_led_switch "lan4" "LAN4" "mx60:green:lan4" "switch0" "0x02" ;; -mbl) +wd,mybooklive|\ +wd,mybooklive-duo) ucidef_set_led_ide "sata" "SATA" "mbl:blue:power" ;; -wndr4700) +netgear,wndr4700) ucidef_set_led_ide "sata" "SATA" "wndr4700:green:hd" ucidef_set_led_switch "wan_green" "WAN (green)" "wndr4700:green:wan" "switch0" "0x20" ucidef_set_led_netdev "wan_yellow" "WAN (yellow)" "wndr4700:yellow:wan" "eth0.2" "tx rx" diff --git a/target/linux/apm821xx/base-files/etc/board.d/02_network b/target/linux/apm821xx/base-files/etc/board.d/02_network index 03df7cb49f..6f4456e8a1 100755 --- a/target/linux/apm821xx/base-files/etc/board.d/02_network +++ b/target/linux/apm821xx/base-files/etc/board.d/02_network @@ -8,13 +8,14 @@ board_config_update board=$(board_name) case "$board" in -mbl|\ -mr24) +meraki,mr24|\ +wd,mybooklive|\ +wd,mybooklive-duo) ucidef_set_interface_lan "eth0" ;; -mx60|\ -wndr4700) +meraki,mx60|\ +netgear,wndr4700) ucidef_add_switch "switch0" \ "0@eth0" "4:lan" "3:lan" "2:lan" "1:lan" "5:wan" ;; diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 4a7e1c0b19..7a13a0afa8 100644 --- a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -52,7 +52,7 @@ board=$(board_name) case "$FIRMWARE" in "pci_wmac0.eeprom") case $board in - wndr4700) + netgear,wndr4700) . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then @@ -70,7 +70,7 @@ case "$FIRMWARE" in "pci_wmac1.eeprom") case $board in - wndr4700) + netgear,wndr4700) . /lib/upgrade/nand.sh if [ -n "$(nand_find_volume ubi0 caldata)" ]; then diff --git a/target/linux/apm821xx/base-files/lib/apm821xx.sh b/target/linux/apm821xx/base-files/lib/apm821xx.sh deleted file mode 100755 index 8f0814b296..0000000000 --- a/target/linux/apm821xx/base-files/lib/apm821xx.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -APM821XX_BOARD_NAME= -APM821XX_MODEL= - -apm821xx_board_detect() { - local model - local name - - model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /model/ {print $2}' /proc/cpuinfo) - - case "$model" in - *"Meraki MR24 Access Point") - name="mr24" - ;; - - *"Meraki MX60/MX60W Security Appliance") - name="mx60" - ;; - - *"MyBook Live"*) - name="mbl" - ;; - - *"Netgear WNDR4700/WNDR4720 Series") - name="wndr4700" - ;; - - *) - name="unknown" - ;; - esac - - [ -z "$name" ] && name="unknown" - - [ -z "$APM821XX_BOARD_NAME" ] && APM821XX_BOARD_NAME="$name" - [ -z "$APM821XX_MODEL" ] && APM821XX_MODEL="$model" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$APM821XX_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$APM821XX_MODEL" > /tmp/sysinfo/model -} diff --git a/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh b/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh deleted file mode 100644 index 5675357533..0000000000 --- a/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_apm821xx() { - . /lib/apm821xx.sh - - apm821xx_board_detect -} - -boot_hook_add preinit_main do_apm821xx diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx index ec540feb84..1a27930d24 100644 --- a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx +++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx @@ -4,8 +4,8 @@ preinit_set_mac_address() { . /lib/functions.sh case $(board_name) in - mr24|\ - mx60) + meraki,mr24|\ + meraki,mx60) mac_lan=$(mtd_get_mac_binary_ubi board-config 102) [ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan" ;; diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx index 97ef6dc68f..a15a055a25 100644 --- a/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx +++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx @@ -1,7 +1,5 @@ #!/bin/sh -. /lib/apm821xx.sh - apm821xx_set_preinit_iface() { ifname=eth0 } diff --git a/target/linux/apm821xx/base-files/lib/preinit/79_move_config b/target/linux/apm821xx/base-files/lib/preinit/79_move_config index 3ca8b0a71c..5d33feb916 100644 --- a/target/linux/apm821xx/base-files/lib/preinit/79_move_config +++ b/target/linux/apm821xx/base-files/lib/preinit/79_move_config @@ -5,12 +5,18 @@ BOOTPART=/dev/sda1 move_config() { . /lib/functions.sh - [ "$(board_name)" = "mbl" ] || return - if [ -b $BOOTPART ]; then - mkdir -p /boot - mount -t ext4 -o rw,noatime $BOOTPART /boot - [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz / - fi + case "$(board_name)" in + wd,mybooklive|\ + wd,mybooklive-duo) + if [ -b $BOOTPART ]; then + mkdir -p /boot + mount -t ext4 -o rw,noatime $BOOTPART /boot + [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz / + fi + ;; + *) + ;; + esac } boot_hook_add preinit_mount_root move_config diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index ecfd70b9ee..897901a9bb 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -9,14 +9,15 @@ platform_check_image() { [ "$#" -gt 1 ] && return 1 case "$board" in - mbl) + wd,mybooklive|\ + wd,mybooklive-duo) mbl_do_platform_check "$1" return $?; ;; - mr24|\ - mx60|\ - wndr4700) + meraki,mr24|\ + meraki,mx60|\ + netgear,wndr4700) return 0; ;; @@ -32,9 +33,9 @@ platform_pre_upgrade() { local board=$(board_name) case "$board" in - mr24|\ - mx60|\ - wndr4700) + meraki,mr24|\ + meraki,mx60|\ + netgear,wndr4700) nand_do_upgrade "$1" ;; @@ -47,7 +48,8 @@ platform_do_upgrade() { local board=$(board_name) case "$board" in - mbl) + wd,mybooklive|\ + wd,mybooklive-duo) mbl_do_upgrade "$ARGV" ;; @@ -61,7 +63,8 @@ platform_copy_config() { local board=$(board_name) case "$board" in - mbl) + wd,mybooklive|\ + wd,mybooklive-duo) mbl_copy_config ;; diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 251ef5f359..94779f5657 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -14,7 +14,7 @@ define Device/Default KERNEL_ENTRY := 0x00000000 KERNEL_LOADADDR := 0x00000000 DEVICE_DTS_DIR := ../dts - SUPPORTED_DEVICES = $$(BOARD_NAME) + SUPPORTED_DEVICES = $$(BOARD_NAME) $(subst _,$(comma),$(1)) endef define Build/dtb