From patchwork Fri Sep 6 15:01:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1159061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bGf22PsW"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="osuu8fnI"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Q14J0n9fz9s3Z for ; Sat, 7 Sep 2019 01:02:08 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=+XJ+fVl6irimhS49byQniGOFqO+dG5PrbNSrxoytx3I=; b=bGf22PsW9PwVVR LTcKvNGyOYJiWjOH1G+cvesxXJiJQI6yJt1f7hhCQdRMXHPnJuPwosWnYGYjsJu95cvOqItRiUi+s 6tfv/KvNI4llSlv3Rbi2UK8d1xKFhVmYyFBHJFs/gvZB3VDitOhdg61hKeCeX4jWJsyCr+KqScF4D Gt0NyVpFYW4EwHeRtbb9X4xdIioNKCxHI9Daza4AYEptZeh1VKPWUC2Gi9npy0UyhYqnHG4Wsi8Yh w1UEiTwzgqbKUwf1lDGewqR3VvQKxShN/7mcwVfLw6q52I2IO5CGC4dEKhYnDognRvG1LfKfmDWYW cShanC9JI503JcteemkA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i6FkT-0003yw-P7; Fri, 06 Sep 2019 15:02:05 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i6Fjn-0003BC-Hf for openwrt-devel@lists.openwrt.org; Fri, 06 Sep 2019 15:01:25 +0000 Received: (wp-smtpd smtp.tlen.pl 23388 invoked from network); 6 Sep 2019 17:01:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1567782075; bh=zq9d/eMAqxehur5UX6AqgSUyIYxU7vqo69Eo+KV0DMY=; h=From:To:Subject; b=osuu8fnIiZwuDy7b8zJhOHdDPUGppAswq72O4TaHFjol2I8Tac7mK8MS7JVxtsjpf 6kvM9WjMRZXuy6mWJjjHauTOX4lr5iG5kOO9FEpTAVEPr0sWIHS9rT0j8IPHhFSaps 7kKzFVM8rNj6y3zvdL7nQ0ODrFHC3kBV5bkrWIo0= Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 6 Sep 2019 17:01:15 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Fri, 6 Sep 2019 17:01:05 +0200 Message-Id: <20190906150108.31098-1-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-WP-MailID: b25e448ee316f3cbbc00348e40e6ce6e X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000002 [QXFm] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190906_080123_740755_F97AB71D X-CRM114-Status: UNSURE ( 8.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 1/4 openwrt-19.07] ath79: dts: fix ja76pf2 spi frequency X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The frequency was filled acording the information from datasheet for particular chip (Winbond 25Q128BVFG). Unfortunately this led to coruption and introduced bad blocks on the chip. Reducing the frequency to commonly used in ath79, made the board more stable and no new bad blocks were spoted. Fixes: b3a0c97 ("ath79: add support for jjPlus JA76PF2") Signed-off-by: Tomasz Maciej Nowak (cherry picked from commit c1db564cbc7cad88606f3caedf81d07b0a60931f) --- target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts index 76f140fa55..b983d1b994 100644 --- a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts +++ b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts @@ -111,7 +111,7 @@ flash@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <104000000>; + spi-max-frequency = <25000000>; partitions { #address-cells = <1>; From patchwork Fri Sep 6 15:01:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1159059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Eyb0VydH"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="RsxKH3jo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Q13k2cHCz9s3Z for ; Sat, 7 Sep 2019 01:01:38 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=sn/RMiT4yeftrqDWt+cxg9k1oszD3EQwZbpmbig0fvM=; b=Eyb0VydHXiR52EwG7uZqenimth rLiRVgsLxhpmTvhKhEnV8H+uZMNt7u2yrpQGtNEWeeEEwDVP7v9C53Dgs77PbkpptmA2fkCyWPVKM 9qTOch/OSSYy7kh89irLNS47srCIT7XiwaVfOpwvNV54qzDGvSu7/4bYyD5sdvt20izGz6KDXg8gX EOsCyNwOODJNhPbzbhGfqOZXhJGGVkilNW9MkqdTXLxGqFs5nXjJiB+8Y6mLxIiWcE4/f6+WML3yi 0KaC3m7yrYkFbNk51ZS5rlMS7bw09bsYJIBplWPTUdvsQ7DTHH93TmImWrR5yOxY6JwXLoviZxFGD x/QNFtug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i6Fk0-0003O5-7N; Fri, 06 Sep 2019 15:01:36 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i6Fjm-0003BD-Ha for openwrt-devel@lists.openwrt.org; Fri, 06 Sep 2019 15:01:24 +0000 Received: (wp-smtpd smtp.tlen.pl 27027 invoked from network); 6 Sep 2019 17:01:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1567782077; bh=goX0dmZLvht6eFO+9N+UMZ8tCObQZAJfV5R0S2Qy/tg=; h=From:To:Subject; b=RsxKH3jogPhL/v0CAB+FDQD25M5zaVhG2Z0HPmTGw7Pb1WcFsZoaUBhJNlFVe8W1F lDwz05A75Nx/2v4kiOkdaJcCNVBWL6tpjIJr3SIl9p5834Xzf8FW+0C4PgSzZTZt4t P/6Le6PukmrZxIxV0flZ5MSDIjVC/sCVAwsi4VHE= Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 6 Sep 2019 17:01:17 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Fri, 6 Sep 2019 17:01:06 +0200 Message-Id: <20190906150108.31098-2-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190906150108.31098-1-tomek_n@o2.pl> References: <20190906150108.31098-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: a6a6ddfc852d98104c2f0814b7e40787 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [4XOk] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190906_080122_908368_D4FF123C X-CRM114-Status: UNSURE ( 8.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 2/4 openwrt-19.07] ar71xx: sysupgrade: accept ath79 combined-image X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org There is md5 sum of whole image embedded in combined-image header which is checked on sysupgrade. The check will fail for ath79 images which may have embedded metadata. This is because metadata are appended after the combined image is created. To allow smooth transition from ar71xx to ath79, strip metadata before calculating md5 sum for whole image. Signed-off-by: Tomasz Maciej Nowak (cherry picked from commit 8b4109c2b4d60495d046157d1baca9b1cdbf8dc8) --- target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 49d9bab959..f42d53ec5d 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -394,7 +394,7 @@ platform_check_image() { } local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null) - local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}" + local md5_chk=$(fwtool -q -t -i /dev/null "$1"; dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}" if [ -n "$md5_img" -a -n "$md5_chk" ] && [ "$md5_img" = "$md5_chk" ]; then return 0 From patchwork Fri Sep 6 15:01:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1159058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QK9q691F"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="fxV/Pg9M"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Q13c69RHz9s3Z for ; Sat, 7 Sep 2019 01:01:32 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=ggAACFfHsaI1On6Lizq6h6ZEjuhTZPttJEN7dUA1B64=; b=QK9q691FMf7kje2az7bRePLb5U fNWmmPk7EK4ctu5l67yJzPnm7n20nfRqrymmF84KUtUS9bat0yfVoSEiNdWFJBgZrm1/SUOKW5kT5 wrYe+XE98ho8QLibUx8BNOLdYDW8qhB2RI81Jsm9ZG1sVqINMwyBg11raQlsvRAnHKRv+7PX3zo4Y 9hCUKp/Qe6H0+mtEjjMIumt2aX1vBhmYobUOSD2Y9SO/sMAveStCVVolRSu5edg01xjWsfnxB1kTo ixrITMrtni12V6SMFkOXX1xjOlNIQT9kA00WSD5nojObn1Hy13N2wTmbR4Tq+TJv8uglwasH5eE3Y rOOGZaSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i6Fjq-0003Cm-JC; Fri, 06 Sep 2019 15:01:26 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i6Fjm-0003BG-Hd for openwrt-devel@lists.openwrt.org; Fri, 06 Sep 2019 15:01:24 +0000 Received: (wp-smtpd smtp.tlen.pl 28723 invoked from network); 6 Sep 2019 17:01:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1567782077; bh=udUfa1eEIn2nXWxOSp9SChg5/zWKCOUtgF4YhmP5XpI=; h=From:To:Subject; b=fxV/Pg9MlslVkoB4CxTCsbvLRqygtHg+E3zNNe1P6Y/B6vt7oh1HvJtj0r6DoZ63k 6U1C2xfQHmaQI3GsRZr0XfGoQjGlGayARmr250MEIBIJqZneZFSkloE8pwrtSSzi6h W3VIjN6PjcGP7l7j0jgua+cwsv8Nk/Yd8f51BgpQ= Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 6 Sep 2019 17:01:17 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Fri, 6 Sep 2019 17:01:07 +0200 Message-Id: <20190906150108.31098-3-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190906150108.31098-1-tomek_n@o2.pl> References: <20190906150108.31098-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 7911b3f008727dd0c7e46e3a1b698191 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [kaNF] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190906_080122_908043_F5859546 X-CRM114-Status: UNSURE ( 6.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 3/4 openwrt-19.07] ath79: image: append metadata to routerstations and ja76pf2 images X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This target enforces metadata check so add the necessary information. It was previously removed because md5 sum check. When using these sysupgrade images on ar71xx target the check would complain about them not matching. Signed-off-by: Tomasz Maciej Nowak (cherry picked from commit 077d06a1a5a23caae4d0c53afb60913955d2a3ea) --- target/linux/ath79/image/generic-ubnt.mk | 2 +- target/linux/ath79/image/generic.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index b189d66770..f9f74d0f51 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -205,7 +205,7 @@ define Device/ubnt_routerstation_common IMAGE_SIZE := 16128k IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | append-metadata | check-size $$$$(IMAGE_SIZE) # IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 4bfdd69d6d..a2b82cbf7f 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -474,7 +474,7 @@ define Device/jjplus_ja76pf2 ATH_SOC := ar7161 DEVICE_TITLE := jjPlus JA76PF2 DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools fconfig - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | append-metadata | check-size $$$$(IMAGE_SIZE) # IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb From patchwork Fri Sep 6 15:01:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1159060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RiTXDiBM"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="HrR/r20u"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Q1443cKVz9s3Z for ; Sat, 7 Sep 2019 01:01:56 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version: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=whNQtVLfLoB/0UJWTbGkklLRXR9fkihcCUwt6ruaUn4=; b=RiTXDiBMrzzDiXUvYxKK6oQ1AT 1PPTJdG/pOkxtThmIIZc6hA38yGacaN13GJN4QscCWudEhTJR6airEjp2PFONrB2cLcj6DWLsBgCO KreP8HrkIUM4hdo37rrQjFQeQW0g/QK625bCq06M8Td+vzVz5pg1aD8pet+mbmhiaHN1JUYvQ3mh1 shXTE7/2VKd0jFGvoXHPQZWtH26Ploeb/FRLDDoOKlPvnTEL35IURpnioIy+CikCg40pRCkvg1noS O/4te3CKIVVs6xd41FBwAQai5/yGxuL9C6Or6ubi4r+BZVUNHxxpw00ACylBf1b9hE63X+rRgGLy6 McLNHUlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i6FkE-0003dh-He; Fri, 06 Sep 2019 15:01:50 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i6Fjn-0003BI-AH for openwrt-devel@lists.openwrt.org; Fri, 06 Sep 2019 15:01:25 +0000 Received: (wp-smtpd smtp.tlen.pl 32503 invoked from network); 6 Sep 2019 17:01:19 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1567782079; bh=xSakmpPvygiAOzeEwx2W0ZqbFkX91BlfkRLbliAE89U=; h=From:To:Subject; b=HrR/r20utQgnDSD89O0xA3RdBSGi8fF+AFzkj8XsRsbq80YGuN+xPh6Q17UIlUnfl HOUJUWhp5syQKPGMopXX9kcK2gCxgqpmB2X5BIYmDKXZcsHi3hsQOYUzgnyaZ1Kofh BuhqT4ZoFAQByH9uEmsKTSRfgHSqpGJIb8niARMk= Received: from 131.ip-164-132-48.eu (HELO localhost.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 6 Sep 2019 17:01:19 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Fri, 6 Sep 2019 17:01:08 +0200 Message-Id: <20190906150108.31098-4-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190906150108.31098-1-tomek_n@o2.pl> References: <20190906150108.31098-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 3d98fd397d355927292c8a3bfad7a852 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000002 [ETGU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190906_080123_517097_1F306A7F X-CRM114-Status: UNSURE ( 6.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 4/4 openwrt-19.07] ath79: image: add supported string for routerstations and ja76pf2 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Now that the md5 check is fixed and metadata present, sysupgrade on ar71xx will complain about device not being supported by the image. Since the cause is not matching strings for supported devices add them accordingly. Signed-off-by: Tomasz Maciej Nowak (cherry picked from commit a45cf75eca4069f24bf5bba8f245de2e553f7f78) --- target/linux/ath79/image/generic-ubnt.mk | 2 ++ target/linux/ath79/image/generic.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index f9f74d0f51..ac3b935900 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -218,6 +218,7 @@ define Device/ubnt_routerstation UBNT_TYPE := RSx UBNT_CHIP := ar7100 DEVICE_PACKAGES += -swconfig + SUPPORTED_DEVICES += routerstation endef TARGET_DEVICES += ubnt_routerstation @@ -227,6 +228,7 @@ define Device/ubnt_routerstation-pro UBNT_BOARD := RSPRO UBNT_TYPE := RSPRO UBNT_CHIP := ar7100pro + SUPPORTED_DEVICES += routerstation-pro endef TARGET_DEVICES += ubnt_routerstation-pro diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index a2b82cbf7f..3b7fdb7015 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -479,6 +479,7 @@ define Device/jjplus_ja76pf2 KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb IMAGE_SIZE := 16000k + SUPPORTED_DEVICES += ja76pf2 endef TARGET_DEVICES += jjplus_ja76pf2