From patchwork Tue Nov 28 21:51:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 842333 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="G767vipw"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="evyQsVtB"; 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 3ymcnS2j6mz9ryr for ; Wed, 29 Nov 2017 08:51:40 +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:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qmGNTG0c/imirMY4T+17DnRco6a7f4QRpROFKUjRdeE=; b=G767vipwj8nAYz GrhQbkOs/5DEltduB9qRpstUy+nJ5dvfXiWrD3NR4Y4yZJA8DhFLl3+5mThwBTb0SVgVgyNU8rHb8 7jVBBNshFt0Z2mIDjgroWcrGyK2rPLq3yGlQlHvs2mI9KTAJx3ma13gFeXNS8JGX/VJGY+lqVzmVA O2TCjf1e/WZBqJ3S8/lGHHZUNOu/yF4wxIcBAr0Hi8A8waODXBbkfzWQJhgkwRXrSYyRYkbZ0YDRu 9K2kWGATEjPiZvKv1uhYSUFGWFNAai07uv1r+RN96T4lmpdcRboYzA5Z47jPiGHzhmsO42ILnIps0 j0Uzdqi/ZxlVOVu1+DvQ==; 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 1eJnn0-0003Uk-E1; Tue, 28 Nov 2017 21:51:38 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJnmw-0003C7-7R for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 21:51:37 +0000 Received: by mail-wm0-x242.google.com with SMTP id t8so2387396wmc.3 for ; Tue, 28 Nov 2017 13:51:12 -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; bh=cfrUWkaG/rniyxmOTUBIyKBwI2C97DQulsPN7dZCstA=; b=evyQsVtBSJ3oE0MvQA7TuXuyORcoAtiWGELDn3NgM6d81Zf0A2Oy9rBOmJQ68vrApg 4I0m74FRc0peayvRi+Zj0wJE8CO/j+7VvJzSc/7RP3D0NSM9eFVyr1ftykGU3NfnUC2u 4gcyxZzPKry4XzklSBK/EQgRB8I2rtlxsQ0RLxvNNoHPGDgkCy2SPIogzSInVAaucwzO szbmWZl+ycAAzTQ6Z6vWL1nJ/f7UuBpz3HA5sshg3oMPnOUUC1iaGTC5ans/XxnCIgaP qTn/Yg0AO7r47cF8XyVGjM5UCodyuS6vp6qnEKBWz7MnBa9zBV2sV4nIHSequ9/7MQVP Nrew== 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; bh=cfrUWkaG/rniyxmOTUBIyKBwI2C97DQulsPN7dZCstA=; b=X8UhqVcflMaHH+OINQgVsf8LkcY7ykXmm+8tJtmlGHRVQ5FtGbvDXSfq1QhUVy06VU cKlBDY7l5wEhPDMTexA1DCI+dXVkyR/iWh+iJkjR2XgWJXfmZ7V3fAIIMUhOgLCKNSiX iTTKo2yF1VoBcMdL4ZuVGIZpcMeE5O5LDhGm8nUgVOEUcfbHLWX/iNmFk7skjm7+yML9 yksI8PG0rScTOt24BC1KmNEHvUFijwqYoGXNF+yVR4o8WMoGRDcBhjUGQg1W1xfBK0Ea PoGtT4eQ+cOjOciiCln8lm09A1cHx20JWfBLDlotpSkjD7phxjMKtNRW3wvNpI12LZfp 7rBw== X-Gm-Message-State: AJaThX7ziqe7frvLrauTI6zgLtoCdW8tVW0DjS5SGa+PcnMss0xYYTF2 qGXqVR+T/RDQivhOycmVGdjL01Vw X-Google-Smtp-Source: AGs4zMao/apPkGMpdWksxjNjYdGf/uTiqGU+GGPVGymgiiP3L4/j8x9t/VAetgEd8qDHExBpDC4gKA== X-Received: by 10.28.20.213 with SMTP id 204mr739048wmu.132.1511905870761; Tue, 28 Nov 2017 13:51:10 -0800 (PST) Received: from debian64.daheim (p200300D5FBC552FC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbc5:52fc::830]) by smtp.gmail.com with ESMTPSA id d17sm91613wrc.14.2017.11.28.13.51.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Nov 2017 13:51:09 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1eJnmX-0001wx-Bs; Tue, 28 Nov 2017 22:51:09 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Tue, 28 Nov 2017 22:51:05 +0100 Message-Id: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171128_135135_027441_A24285A1 X-CRM114-Status: UNSURE ( 7.86 ) 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:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 1/5] build: append metadata for supported images.gz 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: Felix Fietkau MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Targets that either directly or indirectly set CONFIG_TARGET_IMAGES_GZIP currently have no way to append the metadata at the end of new image creation process. And this is going to be necessary in order to convert the targets to use the new fwtool assisted platform check. These will include for example x86(_64), RPI, and MyBook Live images. Note: append-metadata does internally check if SUPPORTED_DEVICES is set, before adding the metadata. Hence, it will not interfere with existing targets that have not been converted. Cc: Felix Fietkau Signed-off-by: Christian Lamparter --- include/image.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/image.mk b/include/image.mk index f4d0a157cd..a7342c9d53 100644 --- a/include/image.mk +++ b/include/image.mk @@ -494,6 +494,7 @@ define Device/Build/image $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)).gz: $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)) gzip -c -9n $$^ > $$@ + $$(call Build/append-metadata) $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)) cp $$^ $$@ From patchwork Tue Nov 28 21:51:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 842337 X-Patchwork-Delegate: blogic@openwrt.org 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="qFk6LaUu"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vFOIUqek"; 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 3ymcph0FQyz9ryr for ; Wed, 29 Nov 2017 08:52:44 +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=LQc2kjaNqtBRzhVghridCBrCUJfmwnHS/Sr3dvDUxtI=; b=qFk6LaUuDSFcJV NdSfDURty0TQlJFOXXKmmG8q6/BtBseS/D4vbnzqdC2e7L6rTMFwxC24ur2RimRHCcr8RuUN/gIHG UFLUcd0gERFTtm2MsqHXUX/oZMG+0VBuHo5iqla2RyZT/x0dR0240bWdnJzrqaLxhLoTdoaLWo+jt h0xrTadLxNLyzPuCPp+oVyEeiwV24U8MAZC4MMtrmP+MkfEdZUr9OJYW51J+DR2DrcLqGBf+S2zpf QHRlPwicG+esJZmXEpl6VA+V6zC7dr9G+0sRRwIk4jqtAcIFFhEElBTL1db+6sLVmBjIw/CAzHWSP 6xVreJvwLpJEq+0u7V5Q==; 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 1eJno1-0004Mb-Op; Tue, 28 Nov 2017 21:52:41 +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 1eJnmx-0003CK-BF for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 21:51:40 +0000 Received: by mail-wm0-x241.google.com with SMTP id v19so2260092wmh.5 for ; Tue, 28 Nov 2017 13:51:13 -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=qjQlIiovBjzzIaxhHJ2QTorq2hJ8H+Dg3qGHE8d3hdQ=; b=vFOIUqekGWA0hsEv7jArtBCmCbwfz94WqGjvvSyVZgyGMUpmXmlqdXn80kSynfe4tn FqpqN+yMFbO0tDn2C3HYMKw5eNJtLzAtBqRzwKiRyIOxgI7CEly1ftr6Edv0t4NU6Yn2 T2YiTRqqGOdKdo9RFXE0roO9HHuBScxEvam4VNqn9pVhmSkf/xBdxXmUneUv/N+pFhjv FiODaTRQUVm7NhwM6GjdEivjlroDBZ6zDLe4BlrFdc9zCKBJ6YQOIs6r54sUbSXbgWtd KliH1cUWCTyKW5EeUulkvcjGgd+ZWHZot2QXctR440ZP5iFbE2nqPlkmj/MNT83UTohE gxYg== 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=qjQlIiovBjzzIaxhHJ2QTorq2hJ8H+Dg3qGHE8d3hdQ=; b=eNPMObH8au4cpDQIdqVEvZ9PiWbirjcLCenlSBpRsNmID5tePDt6r8IsjkrtHzTbyd jl4klwg2akO7QchtLOzmutxZNdObPmEkS4WXfMo+kvniH6L+JTwPFO8O4pVWk6WHQbeW PZhQPOaUi8p/0jRqszUFU+iQ05QIKHeWZzVnEECvpKXTQKHNNswrunHeuUmL6kF/KJxb GElSzgHcWL00lNV+Y66MwLL6uBoNyhSrIVzVC+ilXsoEYj6hkWuFiEFW1IpMYo+uM9X0 IHFoBN01kCjdo9lqukfSu4HngUYDGX9gSvhFTykjKrUFuRIS+A0nq9MN3E1P4++oxQJc oD/Q== X-Gm-Message-State: AJaThX706ohjVLatE4nGbA0vm31FeSPeskfuzQ4L4xvuOP+hXNBAt/0A Sln965sV3vZkPS6sajUG+o6xsmBu X-Google-Smtp-Source: AGs4zMZ6CxivMIDH15/i5Vw5BYl2rP723jGzIXlq7Qq3d0tbHW2e6n5m2hnJfaeefr0U5mAE95UnUA== X-Received: by 10.28.29.130 with SMTP id d124mr894038wmd.73.1511905872120; Tue, 28 Nov 2017 13:51:12 -0800 (PST) Received: from debian64.daheim (p200300D5FBC552FC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbc5:52fc::830]) by smtp.gmail.com with ESMTPSA id m70sm626608wma.36.2017.11.28.13.51.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Nov 2017 13:51:10 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1eJnmX-0001x0-Da; Tue, 28 Nov 2017 22:51:09 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Tue, 28 Nov 2017 22:51:06 +0100 Message-Id: <4ab7bbf6c1c3b16972fe0431106ab82a88de50fe.1511905744.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> In-Reply-To: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171128_135135_566979_55CF6493 X-CRM114-Status: UNSURE ( 9.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.0 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.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 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 1.0 FREEMAIL_REPLY From and body contain different freemails Subject: [LEDE-DEV] [PATCH 2/5] base-files: unify get_dt_led helper function 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: Hannu Nyman , Mathias Kresin , John Crispin MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Lantiq and IPQ806X (which includes IPQ40XX) both define the same custom function {ipq806x|lantiq}_get_dt_led. This patch moves the function into the base-file package at lib/functions/leds.sh to make it more accessible for other targets as well. Cc: Mathias Kresin Cc: John Crispin Cc: Hannu Nyman Signed-off-by: Christian Lamparter --- package/base-files/files/lib/functions/leds.sh | 12 ++++++++++++ target/linux/ipq806x/base-files/etc/diag.sh | 9 ++++----- target/linux/ipq806x/base-files/lib/ipq806x.sh | 12 ------------ target/linux/lantiq/base-files/etc/board.d/01_leds | 12 ++++++------ target/linux/lantiq/base-files/etc/diag.sh | 9 ++++----- target/linux/lantiq/base-files/lib/functions/lantiq.sh | 12 ------------ 6 files changed, 26 insertions(+), 40 deletions(-) diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh index 857e7e5392..83e775fada 100644 --- a/package/base-files/files/lib/functions/leds.sh +++ b/package/base-files/files/lib/functions/leds.sh @@ -1,6 +1,18 @@ #!/bin/sh # Copyright (C) 2013 OpenWrt.org +get_dt_led() { + local label + local ledpath + local basepath="/proc/device-tree" + local nodepath="$basepath/aliases/led-$1" + + [ -f "$nodepath" ] && ledpath=$(cat "$nodepath") + [ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label") + + echo "$label" +} + led_set_attr() { [ -f "/sys/class/leds/$1/$2" ] && echo "$3" > "/sys/class/leds/$1/$2" } diff --git a/target/linux/ipq806x/base-files/etc/diag.sh b/target/linux/ipq806x/base-files/etc/diag.sh index 7c9a9d082c..df4afd936c 100755 --- a/target/linux/ipq806x/base-files/etc/diag.sh +++ b/target/linux/ipq806x/base-files/etc/diag.sh @@ -2,12 +2,11 @@ # Copyright (C) 2016 Henryk Heisig hyniu@o2.pl . /lib/functions/leds.sh -. /lib/ipq806x.sh -boot="$(ipq806x_get_dt_led boot)" -failsafe="$(ipq806x_get_dt_led failsafe)" -running="$(ipq806x_get_dt_led running)" -upgrade="$(ipq806x_get_dt_led upgrade)" +boot="$(get_dt_led boot)" +failsafe="$(get_dt_led failsafe)" +running="$(get_dt_led running)" +upgrade="$(get_dt_led upgrade)" set_state() { status_led="$boot" diff --git a/target/linux/ipq806x/base-files/lib/ipq806x.sh b/target/linux/ipq806x/base-files/lib/ipq806x.sh index 940c7ef204..c4d2c8f258 100644 --- a/target/linux/ipq806x/base-files/lib/ipq806x.sh +++ b/target/linux/ipq806x/base-files/lib/ipq806x.sh @@ -62,15 +62,3 @@ ipq806x_board_detect() { echo "$IPQ806X_BOARD_NAME" > /tmp/sysinfo/board_name echo "$IPQ806X_MODEL" > /tmp/sysinfo/model } - -ipq806x_get_dt_led() { - local label - local ledpath - local basepath="/proc/device-tree" - local nodepath="$basepath/aliases/led-$1" - - [ -f "$nodepath" ] && ledpath=$(cat "$nodepath") - [ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label") - - echo "$label" -} diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds index 2c7a402dfb..187ae68a13 100755 --- a/target/linux/lantiq/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/base-files/etc/board.d/01_leds @@ -4,23 +4,23 @@ # based on ar71xx # +. /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -. /lib/functions/lantiq.sh board_config_update -led_wifi="$(lantiq_get_dt_led wifi)" +led_wifi="$(get_dt_led wifi)" [ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt" -led_usb="$(lantiq_get_dt_led usb)" +led_usb="$(get_dt_led usb)" [ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1" -led_usb2="$(lantiq_get_dt_led usb2)" +led_usb2="$(get_dt_led usb2)" [ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1" -led_dsl="$(lantiq_get_dt_led dsl)" +led_dsl="$(get_dt_led dsl)" [ -n "$led_dsl" ] && { - led_internet="$(lantiq_get_dt_led internet)" + led_internet="$(get_dt_led internet)" if [ -n "$led_internet" ]; then ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" diff --git a/target/linux/lantiq/base-files/etc/diag.sh b/target/linux/lantiq/base-files/etc/diag.sh index 70ed25cb80..4fb47bd273 100644 --- a/target/linux/lantiq/base-files/etc/diag.sh +++ b/target/linux/lantiq/base-files/etc/diag.sh @@ -2,14 +2,13 @@ # Copyright (C) 2010-2015 OpenWrt.org . /lib/functions/leds.sh -. /lib/functions/lantiq.sh -boot="$(lantiq_get_dt_led boot)" -failsafe="$(lantiq_get_dt_led failsafe)" -running="$(lantiq_get_dt_led running)" +boot="$(get_dt_led boot)" +failsafe="$(get_dt_led failsafe)" +running="$(get_dt_led running)" set_state() { - status_led="$boot" + status_led="$boot" case "$1" in preinit) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh index 8c2e0ce5c1..62c7a6b662 100644 --- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh @@ -1,17 +1,5 @@ #!/bin/sh -lantiq_get_dt_led() { - local label - local ledpath - local basepath="/proc/device-tree" - local nodepath="$basepath/aliases/led-$1" - - [ -f "$nodepath" ] && ledpath=$(cat "$nodepath") - [ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label") - - echo "$label" -} - lantiq_is_vdsl_system() { grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo } From patchwork Tue Nov 28 21:51:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 842336 X-Patchwork-Delegate: blogic@openwrt.org 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="ncFDImHy"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uIlGWnl5"; 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 3ymcpM1jmHz9sNV for ; Wed, 29 Nov 2017 08:52: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=onR92tkhn/IdzaoBYL6MzIqhWBeo+gm9mdUJsMMFogM=; b=ncFDImHyiyFlt8duLXdVdscEIZ 1zhDmGlKqFWuHV0Z0M3YhtfCmb+vz+Ybupf1a33FqjuApqsd1Yff6vdAN1jsati8ZTsWA0WxD/c7/ yhuWToPRBs1fi0/np5kzC4KtQb+OL6kZmxYR63l3poOk+9Xb0n4GpW7TU0f7VZ8XU3ZkKiP8o5k9P AW7n+mWMa0ncr9GywsGi5JMwPMSnUpohQKUYiePUiujin3OjDXnpMy+UGxZrrBTH8+eC+o3X79ljN Uep0mnzDgPGA0eaRiOWLZ7krTgktHxAxGxjo+oWnbTv/4eNqns2L2Fis53Jb+wrz54AiMRPE/E/ff JmFvsvEg==; 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 1eJnnl-00048E-1q; Tue, 28 Nov 2017 21:52:25 +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 1eJnmx-0003CR-HZ for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 21:51:40 +0000 Received: by mail-wr0-x244.google.com with SMTP id o2so1517221wro.5 for ; Tue, 28 Nov 2017 13:51:14 -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=BZbAf3LzZg9fH9hBkgFUS5Us7xAy94cZgMu2O0q9+MM=; b=uIlGWnl53o/1A/svoeuOwyP8+p5AEZEPo9+it5GvolBA4+aO2m8xPjbPWBHzzGx5wc m7Sq5EVlaIvRDsPQnSJb4au0lA1Nz1Z1LtTumwnvz3WxnDSRROqgD/Ic6p5kWXijIpjM V4j9IIm79/jo4H+tcg26GoQoDLoaqhm2iBzFEK4hXaN7ZkRp8FiJggLsLi2sPSu7S9pr F/vkO8TX9HimeNOe4BQQY95MwpUNr+fSjpBGsGVZlYdtEKr7+YLWVZq0Ilx4gcbQgaQl 05irNmZ/GBEiANn7eKK84Cno24OKq7rZ0irNMxHd3f4h8ZpKhPuDP+nuXEX9Jk3RMwwS nc9g== 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=BZbAf3LzZg9fH9hBkgFUS5Us7xAy94cZgMu2O0q9+MM=; b=c4N7eQmvlG9BWbDntnCtoRcFE647Jjqg2xPlUb7/M3xwK51LMVpO6Q4Q/ftdqCsvPo nEpTLKaXGCEf8agTrWjVQeFJJPwH0V75H4quNYbbpA1sYp9/adRBcCZPYeetprbh9Uen VHjixt5cPb8vm8ifixKSHY9+frRPAxlOeWphkHjU/PD7JPqfBkSz++5arH0HQJZslr8l I34IfbjT560bdabEsOBKFl7HHXa71RXsrSouJt70cwzkQvaUeXYutgIMTVy8SgKu0hBr 8NwUya4wil91E2audc/scH8jBGMoBBxo1jTFYMrjOX7QwJwtEy8HpocK/pG0mlDHekOM AKnQ== X-Gm-Message-State: AJaThX7fB7m/cFL/du59q4lQqFGa9qlbNGQmZjXYCwT2t9IASEbN64jA ADC1s4he5roMxYnRTO6cZkUO2asY X-Google-Smtp-Source: AGs4zMb1u2FG1gCHy5IefiyNhgAuleg74LDn5MTQQ6rGvJMEK6w8lcIiku4HSXUuMmhzvGuW0E9O6Q== X-Received: by 10.223.163.11 with SMTP id c11mr485347wrb.214.1511905872922; Tue, 28 Nov 2017 13:51:12 -0800 (PST) Received: from debian64.daheim (p200300D5FBC552FC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbc5:52fc::830]) by smtp.gmail.com with ESMTPSA id 92sm46173wrd.15.2017.11.28.13.51.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Nov 2017 13:51:10 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1eJnmX-0001x4-FG for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 22:51:09 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Tue, 28 Nov 2017 22:51:07 +0100 Message-Id: X-Mailer: git-send-email 2.15.0 In-Reply-To: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> In-Reply-To: <4ab7bbf6c1c3b16972fe0431106ab82a88de50fe.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> <4ab7bbf6c1c3b16972fe0431106ab82a88de50fe.1511905744.git.chunkeey@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171128_135135_798817_4350A339 X-CRM114-Status: UNSURE ( 9.13 ) 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 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 3/5] apm821xx: convert to dt based diag LED script 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 Please note that users with a Netgear WNDR4700 will need to update the device-tree partition manually. For instructions, please refere to commit 49856a4bb581 ("apm821xx: make it possible to update the dtb partition on the WNDR4700") Signed-off-by: Christian Lamparter --- target/linux/apm821xx/base-files/etc/diag.sh | 48 +++++++++++++++------------- target/linux/apm821xx/dts/MR24.dts | 8 +++-- target/linux/apm821xx/dts/MX60.dts | 8 +++-- target/linux/apm821xx/dts/apollo3g.dtsi | 8 +++-- target/linux/apm821xx/dts/wndr4700.dts | 8 +++-- 5 files changed, 49 insertions(+), 31 deletions(-) diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh index eb9b04b525..e45f2a8522 100755 --- a/target/linux/apm821xx/base-files/etc/diag.sh +++ b/target/linux/apm821xx/base-files/etc/diag.sh @@ -3,40 +3,42 @@ . /lib/functions.sh . /lib/functions/leds.sh -get_status_led() { - local board=$(board_name) - - case $board in - mbl|\ - mr24|\ - mx60|\ - wndr4700) - status_led="$board:green:power" - ;; - - *) - ;; - esac -} +boot="$(get_dt_led boot)" +failsafe="$(get_dt_led failsafe)" +running="$(get_dt_led running)" +upgrade="$(get_dt_led upgrade)" set_state() { - get_status_led + status_led="$boot" case "$1" in + preinit_regular) + status_led_blink_preinit_regular + ;; preinit) status_led_blink_preinit ;; - failsafe) + status_led_off + [ -n "$running" ] && { + status_led="$running" + status_led_off + } + status_led="$failsafe" status_led_blink_failsafe ;; - - preinit_regular) - status_led_blink_preinit_regular - ;; - + upgrade) + [ -n "$running" ] && { + status_led="$upgrade" + status_led_blink_preinit_regular + } + ;; done) - status_led_on + status_led_off + [ -n "$running" ] && { + status_led="$running" + status_led_on + } ;; esac } diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts index 8d20872c3f..75bb32255c 100644 --- a/target/linux/apm821xx/dts/MR24.dts +++ b/target/linux/apm821xx/dts/MR24.dts @@ -20,6 +20,10 @@ aliases { serial0 = &UART1; + led-boot = &status; + led-failsafe = &failsafe; + led-running = &status; + led-upgrade = &status; }; chosen { @@ -91,12 +95,12 @@ gpio-leds { compatible = "gpio-leds"; - power-green { + status: power-green { label = "mr24:green:power"; gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>; }; - power-orange { + failsafe: power-orange { label = "mr24:orange:power"; gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/MX60.dts index 4ec0043f32..6c753639b2 100644 --- a/target/linux/apm821xx/dts/MX60.dts +++ b/target/linux/apm821xx/dts/MX60.dts @@ -20,6 +20,10 @@ aliases { serial0 = &UART1; + led-boot = &status; + led-failsafe = &failsafe; + led-running = &status; + led-upgrade = &status; }; chosen { @@ -120,12 +124,12 @@ gpio-leds { compatible = "gpio-leds"; - power-green { + status: power-green { label = "mx60:green:power"; gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>; }; - power-orange { + failsafe: power-orange { label = "mx60:orange:power"; gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/apm821xx/dts/apollo3g.dtsi b/target/linux/apm821xx/dts/apollo3g.dtsi index 783348a678..09a8b8518c 100644 --- a/target/linux/apm821xx/dts/apollo3g.dtsi +++ b/target/linux/apm821xx/dts/apollo3g.dtsi @@ -14,6 +14,10 @@ aliases { serial0 = &UART0; + led-boot = &status; + led-failsafe = &status; + led-running = &status; + led-upgrade = &status; }; }; @@ -113,13 +117,13 @@ gpio-leds { compatible = "gpio-leds"; - power-red { + failsafe: power-red { label = "mbl:red:power"; gpios = <&GPIO1 4 GPIO_ACTIVE_HIGH>; linux,default-trigger = "panic"; }; - power-green { + status: power-green { label = "mbl:green:power"; gpios = <&GPIO1 5 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/apm821xx/dts/wndr4700.dts b/target/linux/apm821xx/dts/wndr4700.dts index d1a65f3e62..2e0addf74b 100644 --- a/target/linux/apm821xx/dts/wndr4700.dts +++ b/target/linux/apm821xx/dts/wndr4700.dts @@ -19,6 +19,10 @@ aliases { serial0 = &UART0; + led-boot = &status; + led-failsafe = &failsafe; + led-running = &status; + led-upgrade = &status; }; chosen { @@ -348,12 +352,12 @@ gpio-leds { compatible = "gpio-leds"; - power-green { + status: power-green { label = "wndr4700:green:power"; gpios = <&GPIO0 8 GPIO_ACTIVE_HIGH>; }; - power-orange { + failsafe: power-orange { label = "wndr4700:orange:power"; gpios = <&GPIO0 9 GPIO_ACTIVE_LOW>; linux,default-trigger = "panic"; From patchwork Tue Nov 28 21:51:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 842334 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="uzNz+wlY"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B0PdN+Pg"; 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 3ymcnj4YJhz9ryr for ; Wed, 29 Nov 2017 08:51:53 +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=XpVjMqF05K4ieSkqb7sl5a6/L3ZBbJyJJL0C4BSMorw=; b=uzNz+wlYAKjMQHlJa0Q2asghy5 2YWHRI4oIaSQDQifpSr8qHgxZZkjl6VJTH+trruvZ3MdvOso6e1t35Ec2AORFq/hO2IG7EDhG7n6H oOiuCaj8snYItpjmOHZ/Ji6X6wIO1+9aRuqmMLDxsw8tLc4kKC2yqaQGw4edG8f3Qxv3+yFbVv7zY UJ07cUAZ6GhuJE1lx8zEu3xL40+QDIDZwdZi9RbY4my1jYHxBq+cdPGSw0ubW9iF5N+6YwRhksJRH G5zDKkKtzTrAsbLGjgWlzJo37V6TcLw+n448wbqhc44E8mOCqqNVx0TT1F1r3b/Yu7+nUCVNNtCFz E/UfQwJw==; 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 1eJnnD-0003ft-I7; Tue, 28 Nov 2017 21:51:51 +0000 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJnmw-0003CJ-LJ for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 21:51:37 +0000 Received: by mail-wm0-x22a.google.com with SMTP id g130so33678473wme.0 for ; Tue, 28 Nov 2017 13:51:13 -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=iO+w4LqdmGNrpbzpNuKNKAc+4fWWrR/7OMtjCY3QkWw=; b=B0PdN+PgytQAr75+DFrJnG5PM03pAeWNP1ZGhGGfEo3huNuOH68K5CPIP4Ey/SvuIh Sjfl3Rp66IpBS7xcgv7EVw9lH6h7c4aP/CY1/Tbg1PKC40U4c54ligBN5mV4Nid5bhfi 4Vkf5AfE+w5OeEXkcEVyVulNC8/lmYAQ1aXTL62T92STFDtehZPxkl4gAPx32Qu2VFLo S4ODOIDxnKExRVRGXfNDHf/2PScDVIisSXJd9Bg9shKfTXsUtIybo36KV1XKsWYz6pzi kBkCEfD0eiIa8uTSpyvcZPYEHwei/VuYTrlMolwp25XbbdYJCFZJEE/NTrMuw/2CzmFL nV3g== 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=iO+w4LqdmGNrpbzpNuKNKAc+4fWWrR/7OMtjCY3QkWw=; b=fIOQBo3chFBQTIBCZnAJM3bPHHTC6XEEPZZ/0qYj7NiOraKixE5MOXPA+7YDoai7Tb p71xbfTPwxr/g09YTt5+cxQMUcCOqd53mibiZbqfnDS4n5BSy5JnoP1iVR6QKVnBjDXd GdzqlpQtHQ64m0IsqsRhqVqMFeAnoQ7ECNB4sc4WNDjGISHgAY+4w2gjZs2DFoJIyJ+X vCXW9yVq1sI/wnbTkhKmUeXT1zyiUzXPQmm+Qw1OySk9LXMEtTvglAvKt3bFvSr3PRH/ Gms5sGZ7DQy9T+n+7HvlMgVK/BQh+GZrfy/KH2E2cgAs9zD4j2QMTYsT+4ec4WV0vYvc EHhw== X-Gm-Message-State: AJaThX7eBFzLVC+6VUvVWE/ndh1ccFv4qi4DDTBUzM2VPOKWuZfmKRZD DWewZIiSrw1wsCNxzzTjbot0QT71 X-Google-Smtp-Source: AGs4zMaZ+s0np71IsOkmfkVOxlYWm8YVJEPuExGJC4MfB1a8l0USBFH+7nrkUgcjyFPEuelJuNIjhg== X-Received: by 10.28.239.12 with SMTP id n12mr732415wmh.140.1511905871441; Tue, 28 Nov 2017 13:51:11 -0800 (PST) Received: from debian64.daheim (p200300D5FBC552FC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbc5:52fc::830]) by smtp.gmail.com with ESMTPSA id r14sm110728wrb.43.2017.11.28.13.51.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Nov 2017 13:51:10 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1eJnmX-0001xA-Gy for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 22:51:09 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Tue, 28 Nov 2017 22:51:08 +0100 Message-Id: <06fdac286208441c5ff0f2b28ec69e8ab9093bb0.1511905744.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> In-Reply-To: References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> <4ab7bbf6c1c3b16972fe0431106ab82a88de50fe.1511905744.git.chunkeey@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171128_135134_927722_B90D985C X-CRM114-Status: GOOD ( 15.78 ) 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:22a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 4/5] apm821xx: use x86's upgrade scripts for MyBook Live 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 Advantages: - preserves existing partition layout. On the hard-drive. Only the boot and rootfs partition will be overwritten. Disadvantages: - The upgrade process takes much longer to run. from 2-3 seconds to 15-25 seconds. Please note that sysupgrade will refuse to upgrade, if the existing installation has an incompatible partition layout. Future changes to the bootfs and/or rootfs partition size will likely cause breakage to the sysupgrade procedure. In these cases, the ext4-rootfs.img.gz install procedure will have to be used. Please don't forget to backup your configuration in this case. Note2: This patch requires "base-files: upgrade: make get_partitions() endian agnostic" Note3: If your current installation does not host the two changes, sysupgradeing will then wipe the existing partition layout. Don't forget to backup your data! Signed-off-by: Christian Lamparter --- .../apm821xx/base-files/lib/upgrade/platform.sh | 2 +- .../apm821xx/base-files/lib/upgrade/wdbook.sh | 95 +++++++++++++++++++--- 2 files changed, 83 insertions(+), 14 deletions(-) diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index 55f8ffa75d..8c716bf44e 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -9,7 +9,7 @@ platform_check_image() { case "$board" in mbl) - mbl_do_platform_check $board "$1" + mbl_do_platform_check "$1" return $?; ;; diff --git a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh index d7347516cb..b84f80f326 100644 --- a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh @@ -1,5 +1,7 @@ . /lib/functions.sh +# copied from x86's platform.sh + get_magic_at() { local file="$1" local pos="$2" @@ -7,30 +9,97 @@ get_magic_at() { } mbl_do_platform_check() { - local board="$1" - local file="$2" - local magic + local diskdev partdev diff - magic=$(get_magic_at "$file" 510) + [ "$#" -gt 1 ] && return 1 - [ "$magic" != "55aa" ] && { - echo "Failed to verify MBR boot signature." + export_bootdevice && export_partdevice diskdev -2 || { + echo "Unable to determine upgrade device" return 1 } + get_partitions "/dev/$diskdev" bootdisk + + #extract the boot sector from the image + get_image "$file" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null + + get_partitions /tmp/image.bs image + + #compare tables + diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" + + rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image + + if [ -n "$diff" ]; then + echo "Partition layout has changed. Full image will be written." + ask_bool 0 "Abort" && exit 1 + return 0 + fi + return 0; } mbl_do_upgrade() { + local diskdev partdev diff + + export_bootdevice && export_partdevice diskdev -2 || { + echo "Unable to determine upgrade device" + return 1 + } + sync - get_image "$1" | dd of=/dev/sda bs=2M conv=fsync - sleep 1 + + if [ "$SAVE_PARTITIONS" = "1" ]; then + get_partitions "/dev/$diskdev" bootdisk + + #extract the boot sector from the image + get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b + + get_partitions /tmp/image.bs image + + #compare tables + diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" + else + diff=1 + fi + + if [ -n "$diff" ]; then + get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync + + # Separate removal and addtion is necessary; otherwise, partition 1 + # will be missing if it overlaps with the old partition 2 + partx -d - "/dev/$diskdev" + partx -a - "/dev/$diskdev" + + return 0 + fi + + #iterate over each partition from the image and write it to the boot disk + while read part start size; do + # root is /dev/sd[a|b]2 and not /dev/sd[a|b] this causes some problem + # one of which is this offset, I'm not sure what's the best fix, so + # here's a WA. + let part=$((part - 2)) + if export_partdevice partdev $part; then + echo "Writing image to /dev/$partdev..." + get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync + else + echo "Unable to find partition $part device, skipped." + fi + done < /tmp/partmap.image + + #copy partition uuid + echo "Writing new UUID to /dev/$diskdev..." + get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync } mbl_copy_config() { - mkdir -p /boot - [ -f /boot/uImage ] || mount -t ext4 -o rw,noatime /dev/sda1 /boot - cp -af "$CONF_TAR" /boot/ - sync - umount /boot + local partdev + + # Same as above /dev/sd[a|b]2 is root, so /boot is -1 + if export_partdevice partdev -1; then + mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt + cp -af "$CONF_TAR" /mnt/ + umount /mnt + fi } From patchwork Tue Nov 28 21:51:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 842335 X-Patchwork-Delegate: blogic@openwrt.org 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="bXClx1yl"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hDvpbIWj"; 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 3ymcp86Z2gz9ryr for ; Wed, 29 Nov 2017 08:52:16 +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=vMXA5yG9getIgAjgoa0ra0QNhsATPJcvV/RnDOSTssk=; b=bXClx1ylx6kwHT86ByhIXi2KSs eLLbeksVIshbxdWEJuqh54s5wznDH6Q47ux1eASYhCUx+CmwJ8qpvNBwONqSbFbNH3g0zpOIsgK2J BrLM5yfSs3t+hNLoHSaCIW/g6yt1YQ/8epdhWylS1SxlX/GlbA2bsZdqNCYD6/HyjxyboULP7bY17 cCMv/gBUxB25VNntxz031XFvu9dIO4201awNYCd1ouTmwOWzTAbn8r+Iu9saoNZzW5WMVkF0Aw7Jn cJJ2EiQ1RJUDFXczMkyD1CQNg7bUJYdh3MX3y3jrbTLy0EzCZGeNK3GVtQR7lFxQWYFpOpvyBcFDv TPrWsC7w==; 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 1eJnnV-0003ug-Ld; Tue, 28 Nov 2017 21:52:09 +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 1eJnmy-0003CS-1l for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 21:51:39 +0000 Received: by mail-wr0-x243.google.com with SMTP id v22so1527001wrb.0 for ; Tue, 28 Nov 2017 13:51:15 -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=xtjWT9KMQSIhxabd40yh06ZRO2zpauysqKQYEkymkbg=; b=hDvpbIWjpW/0dYulIn5lw+9LJKcgk+phrqc8YUCFxH4SalrPAR3EvTCvf7pmw2NZHu oUbGeTsHNLhDcPfGd0Wm2HwmZqF3u7lgPkuWxtPg3o75ntk9GvxT52eYwCwP6BlnChkB uYpej2mt2VUvU/T5amC0Dm4Kc4A9DjSlgt4sSez/FVcF+lRh1Qz3wleKY1xoHbQHUVxX hggm4BKQBtWaUW7EA0ZbDmrf5bLKAk0K2OsfAAKMLGmhYETHtnjTjt0wQLHOzAAJUzEj ZFuJhJSG4o8BHa7hhsMdOGD+7KQcquj3Uav9Ura3ELjrd1vvRXjqxGeG5pFSvnz/h9du Lh6A== 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=xtjWT9KMQSIhxabd40yh06ZRO2zpauysqKQYEkymkbg=; b=lqNIHQTnm2GfemCCGpId+pyGQP4ed1ZMOWXCDOnEaV0B3pm7bzjVit/dHUQrmvDXOH bRUqbMfd+LDl3Xpw+g38ioNeEUrxi1yyQ+Jpf8m4oB9JCYM8SGCRXICV697FFtR78cBH CSSK934M47iyEHMWenbBqfW7fkBBuP/4vCCdoiafPaofYjfoMF8FbRjRwfiqsGP5blY0 9MN++sG1lRxYXVCi6j0ewCA8JaJfaNm5PoRnN/2cvIdjQYJB6BvTla0kbPAVWugCNJat DJXALN+4ys/LzxjFgmfS12oK4F4sKkGyvxjWueBC4IAm/ZbjWRRTRO4PM//1E7gRo0SR Z1hg== X-Gm-Message-State: AJaThX6e0oLeiOKAX76ThvshgMHPha3OXIfVjpVOYfLoDWRjoeYaHU0G nXeuoMmPKKcmOGrieZj6/mVE/1iy X-Google-Smtp-Source: AGs4zMbJCW44OsY2K5vpOS6YT8Y8qUPgQmHJG7w0rVO3fulyqF7+buuBhywNMGlqFrL9YIuFFCqwjw== X-Received: by 10.223.172.115 with SMTP id v106mr476252wrc.195.1511905873703; Tue, 28 Nov 2017 13:51:13 -0800 (PST) Received: from debian64.daheim (p200300D5FBC552FC0000000000000830.dip0.t-ipconnect.de. [2003:d5:fbc5:52fc::830]) by smtp.gmail.com with ESMTPSA id q81sm410397wmg.22.2017.11.28.13.51.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Nov 2017 13:51:10 -0800 (PST) Received: from chuck by debian64.daheim with local (Exim 4.89) (envelope-from ) id 1eJnmX-0001xV-Ii for lede-dev@lists.infradead.org; Tue, 28 Nov 2017 22:51:09 +0100 From: Christian Lamparter To: lede-dev@lists.infradead.org Date: Tue, 28 Nov 2017 22:51:09 +0100 Message-Id: <67f5fef6a743c3d1b53d3e5c941695961d5acd99.1511905744.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> In-Reply-To: <06fdac286208441c5ff0f2b28ec69e8ab9093bb0.1511905744.git.chunkeey@gmail.com> References: <9bf13786bcddfa7a6edebe1a685d57ce0c1f6f94.1511905744.git.chunkeey@gmail.com> <4ab7bbf6c1c3b16972fe0431106ab82a88de50fe.1511905744.git.chunkeey@gmail.com> <06fdac286208441c5ff0f2b28ec69e8ab9093bb0.1511905744.git.chunkeey@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171128_135136_248119_BAC2374E 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:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH 5/5] apm821xx: MyBook Live convert to DT PHY 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 Changes MyBook Live to use DT PHY probing and the broadcom phy driver. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/apollo3g.dtsi | 11 +++++++++++ target/linux/apm821xx/sata/config-default | 1 + 2 files changed, 12 insertions(+) diff --git a/target/linux/apm821xx/dts/apollo3g.dtsi b/target/linux/apm821xx/dts/apollo3g.dtsi index 09a8b8518c..e88973f8d2 100644 --- a/target/linux/apm821xx/dts/apollo3g.dtsi +++ b/target/linux/apm821xx/dts/apollo3g.dtsi @@ -171,6 +171,17 @@ &EMAC0 { status = "okay"; + + phy-map = <0x2>; + phy-address = <0x1>; + phy-handle = <&phy>; + + mdio { + phy: phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + }; }; &SATA1 { diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default index b8342de049..7ca6bd4d3d 100644 --- a/target/linux/apm821xx/sata/config-default +++ b/target/linux/apm821xx/sata/config-default @@ -1,5 +1,6 @@ # CONFIG_IKAREM is not set CONFIG_APOLLO3G=y +CONFIG_BROADCOM_PHY=y CONFIG_EXT4_FS=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y