From patchwork Thu Aug 22 18:59: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: 1151752 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="tHKcPL7S"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="ujgu7Td8"; 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 46Dv3b4Q7Nz9sBF for ; Fri, 23 Aug 2019 04:59:55 +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=x8EfHaoXiGyKl+tf12DI77uGBsrHudo2EFVIqnxVTDk=; b=tHKcPL7SoA0l1l3yH8OyliJkiv GNkAKgvkUkmFnvvYf5pXYMJFTzsEhwlQsvz7wEsRc49NBwq4YINitizaI7od/ulNYbjnm9qh4l+HJ 9AOXQ4JlnEDyR5PnJEAUpaWu3PFLTC0eDoeqHryV9cVP1F4bQBoRaOjVFpC3letqNIqVh4QzqZ6oX 8mg2Ti6cqQrb+wCeJlhRAF1T3KTyr3zn7U3OuwRH9Lv5N1og3DHLCut1q+HU03G04fIPYhHUoqYAx aTmepm8t8Ektt+uFB1KfwMrfHfC+pdWp9pW1KZUySO7mRQOlx4XmrP/aaV3e59MTn0kGeiwUdV1MY cNy/TwUg==; 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 1i0sJI-00020P-Ig; Thu, 22 Aug 2019 18:59:48 +0000 Received: from mx-out.tlen.pl ([193.222.135.148]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sIt-0001Xo-BU for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 18:59:26 +0000 Received: (wp-smtpd smtp.tlen.pl 24156 invoked from network); 22 Aug 2019 20:59:19 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500359; bh=+KfB8ZtyJDfU+nItn+usHiflkqAfQWST/gZbmX/3hc0=; h=From:To:Subject; b=ujgu7Td87kNshXZlWYAnHPOWxqzLeldLei91Z07vfRB67ARlalOaJlf6kvuH3NGqF o4U7uQRRds42XpjLO3k569YTWwUKM2lJXguDFlnpSQW2ZkTVtHjB85EXxWqXko8wgM xcGm70T49HCLy+7BME+1R9eqsRcGxK0H9kvW0O8I= 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 ; 22 Aug 2019 20:59:19 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:05 +0200 Message-Id: <20190822185911.12336-2-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: ad0bc731d1d950cf483ca817cb64ec8a X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [8TPE] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_115924_168538_87790D94 X-CRM114-Status: UNSURE ( 9.35 ) 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -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/7] 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 --- 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 Thu Aug 22 18:59: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: 1151758 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="mqA6gQbm"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="weh4tAB/"; 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 46Dv4g6g7fz9sBF for ; Fri, 23 Aug 2019 05:00:51 +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:Cc: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:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TYTsfC8zO7cZKgpav12BS1kkBvuyVX9YxHKdUeHB3eI=; b=mqA6gQbm2+Ycv5 3qikw35SUaw6xG8+a98PDoXbJfY/Xdnu2rx5zPCJF7UUNDW5NTRahlLqdNkmytsfFHzwd4oRp+RIl mTAmJ8JB9ks0qfNc0seoh3Y/OqkZmgM4BdKIZ/XwKufdMNGBSz42qKzZc45p/kJQgRGp2hu30CgcI wXCMxRBnyBPUPLb318sFHNrB8UQC6FWxMAWdpZ3Vzveq6ynlaS7/84t2PsHDh6nTR88kk9tw5EgqK DptSAhHI6ylqA/n7MwJ+xS9d9nljwS4XOSjH8DE1j5Jb9L9MXRrq/c24QC+g1z5OVlQqIjhNQW2QA 1PHeOw1IcRh12hNwS7rw==; 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 1i0sK5-0003zb-8Y; Thu, 22 Aug 2019 19:00:37 +0000 Received: from mx-out.tlen.pl ([193.222.135.148]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sIu-0001Xp-PR for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 18:59:27 +0000 Received: (wp-smtpd smtp.tlen.pl 25436 invoked from network); 22 Aug 2019 20:59:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500360; bh=pUVDW1+4GlMVL8RBYkIPEF2a9jTfwZZgrvtdCkU09co=; h=From:To:Cc:Subject; b=weh4tAB/Wk+57A2aTFfPlCgD1mkMjUZLhaOZCXkx23H7i/NJ9/dT1J9R7DqIa72eO 1NEujpkHtubt352LDZuGGshTIOBiUQ4ZEWFN6qtC62uL6kPdu11n1uMiFq16hcQMXt GNTvvPT/60bBUr6GCsJjwvBF0MSz0zNZBCK5OZhs= 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 ; 22 Aug 2019 20:59:20 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:06 +0200 Message-Id: <20190822185911.12336-3-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 4a535f5d9102e6455d0207886857abc8 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [gWMU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_115924_981438_24480F38 X-CRM114-Status: UNSURE ( 7.57 ) 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -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/7] ath79: image: retire combined-image for Adtran/Bluesocket devices 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: , Cc: Brian Gonyer , Daniel Gimpelevich Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org During review it slipped by that these devices use combined-image which should never be used for newly added ones. Therefore switch to sysupgrade-tar generated images introduced in 8f6f260 ("ath79: routerstation: prepare to use sysupgrade-tar format image"). The sysupgrade accepts both images for now so no reression should occur. Cc: Brian Gonyer Cc: Daniel Gimpelevich Signed-off-by: Tomasz Maciej Nowak --- target/linux/ath79/image/generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 6f1ad5b708..45a1baa632 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -108,7 +108,7 @@ define Device/adtran_bsap1880 IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel | pad-to $$$$(BLOCKSIZE) IMAGE/rootfs.bin := append-rootfs | pad-rootfs - 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 endef define Device/adtran_bsap1800-v2 From patchwork Thu Aug 22 18:59: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: 1151750 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="qky86wZO"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="FLL4xTiM"; 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 46Dv3B4nNGz9sBF for ; Fri, 23 Aug 2019 04:59:34 +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=An0bdxEzFt5XQ1IMYGPBvUu9nKDwHMuw+KbzTOFf2i8=; b=qky86wZOAjNnTgqKLLND7On+RI ugdPCiktyAdkmJ2lE+JQw0AEQ+rHHWVOv/Wnp/v3Rpp4ngEbOAI0DLXRzEwYxPoPWJP7ChJ1m7rGQ 4zEDVdTC4lh16IaZnpnOqZzDyxVuU++vzttMidjRREqqlud3FQF3HZYPSRSUYliNmNUCNWJbTsH6N dFckWUTjAu8yoQ+B4C2DX2xLcwATdoJ0nwIW+eIu1VoEA8sn747xU1CMqwjTZ8NZ4+5B8f2Ty+Jhk a33gzkixIgTxJDDH3S+NlEzySZ90Nzvr8y+8i5qmO11fCVKwXiAPjUDcRBsJeGef0+8dsdHwhznAY PQSnxjzQ==; 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 1i0sIx-0001ZQ-DC; Thu, 22 Aug 2019 18:59:27 +0000 Received: from mx-out.tlen.pl ([193.222.135.148]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sIt-0001Xr-SH for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 18:59:25 +0000 Received: (wp-smtpd smtp.tlen.pl 27740 invoked from network); 22 Aug 2019 20:59:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500362; bh=scqOTPX4o71PPGJUEStnnTRwkPQFxTEnJFMR/YBtkjc=; h=From:To:Subject; b=FLL4xTiMEr45pJ4gSoudgkk/d6TXMZ+HXjPUL8HBLNO5Fr8760Id7Su1Y5PauL+lg XtoQ6mfafzzdWnBx6jCeVn9dPXYGJ7A4K+KlXXDrfFDrJ+MBwL635DZhoUd2VVCaSt roJIOyIVsAlylqvAldldXjvrEk3SHF5todqlVTBI= 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 ; 22 Aug 2019 20:59:21 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:07 +0200 Message-Id: <20190822185911.12336-4-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 9069f7ec5c7636c4ed214c5914ee7468 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [MQM0] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_115924_168455_B9DF6C59 X-CRM114-Status: UNSURE ( 8.15 ) 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -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/7] 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 --- 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 6898c0e0c2..3853140702 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 Thu Aug 22 18:59: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: 1151754 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="sAbJ44VK"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="DuChldRr"; 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 46Dv4H3jkWz9sBF for ; Fri, 23 Aug 2019 05:00:31 +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=6xNkfL3FwpCmDUQQhT1moAt258ZwPBGc2BQGdEYR6C8=; b=sAbJ44VKyEoXZ0dF7JOXVMKLJB ss00dS9fbn2rG3+KUmFSpXW03qpn3dkciOI5FJNOhbDDnvTLHW/U0p0SvHRFqXL/15hYcUDmlYRLV 1Li2MwnqFNk8bLGKzfPXxvpYxrxpwEKPGVpzA8OrwBQsx4ddyFXxnU9mTXYenozgkeNwrK9Zr4Vjo +Mp+8PtOj4u8rVQedIYVh1g8LwiS83J9E+w6a40j+UI9HAizWMFzKX/kxrvs6TBJr5oWuOUOd6b1w Demqm8o9xR1nj2EehJIP64q/4agh4SJNJiXx8VtF07FisovQ3VJ8n9BxbNSEC1wmv13xqOGWwoWg9 AHBuUGZg==; 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 1i0sJs-0003jg-G0; Thu, 22 Aug 2019 19:00:24 +0000 Received: from mx-out.tlen.pl ([193.222.135.148]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sIu-0001Xt-Fk for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 18:59:27 +0000 Received: (wp-smtpd smtp.tlen.pl 28525 invoked from network); 22 Aug 2019 20:59:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500362; bh=y5wKHeeBOWRq/9HSOJrt3QXoyb7lsFAc0K0SIvTtss8=; h=From:To:Subject; b=DuChldRrlm3V5PhGXQOiZ8HQ5sCcx0lAHUXec/SMDucg7H0GBq5D6xRYWJBVl/dlK pESMlBHSX63cPE25iUrVAo8zFvydxDBYfGgdQXQ3Olmvbgo8Mudd+yRnYmPHMi0NJD xONH3RRuJdPmjiauvDT4APjWi8CUrHL9L7jHFnkU= 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 ; 22 Aug 2019 20:59:22 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:08 +0200 Message-Id: <20190822185911.12336-5-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 17a66baded0292d591a0717c9fff5875 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [AcO0] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_115924_684672_9BB80AF6 X-CRM114-Status: UNSURE ( 6.42 ) 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -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/7] 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 --- 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 6db083861f..3af1f2676e 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -210,7 +210,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 45a1baa632..c1cd347baf 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -643,7 +643,7 @@ define Device/jjplus_ja76pf2 DEVICE_VENDOR := jjPlus DEVICE_MODEL := 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 Thu Aug 22 18:59:09 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: 1151759 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="kDzqbabS"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="WIaZr97s"; 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 46Dv4m6Y6Wz9sBF for ; Fri, 23 Aug 2019 05:00: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=om24wVUX7fPIoAqBOTlpJDJ5Yx8RRBeXXMzlEjl//ig=; b=kDzqbabSAVRxkLcXIeUopZc8Di OSHrJgli7AWHZb0p4QvXTkpvl63tArV5YBh0AaecPy4PhIPmJ07vPISzx1+M0WFcOws6aTMMe1gL8 gufdAnVGQLtEYxjY5qo/PASk5k1EDd8B6aGM8dV4x5AuDztebY7dmz06O8AegQ1w7MGhwNm5l94aW o6D0qUD69FDOiAZQSSLJPY22TeXDMdzCE4mpKwwMW2hkSjREQHUTWYW4hqFdx88+RcX6EvU/wZPkU +n+AMihIQhKy5s6ZTmyxqok8IPiLDwNGcvphaMgohmAKvv680sNA0Qsg4jSTwIlX9APxl7VjJXsiW ePThcObA==; 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 1i0sKI-0004F6-5G; Thu, 22 Aug 2019 19:00:50 +0000 Received: from mx-out.tlen.pl ([193.222.135.148]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sIv-0001Xu-5R for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 18:59:27 +0000 Received: (wp-smtpd smtp.tlen.pl 29321 invoked from network); 22 Aug 2019 20:59:23 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500363; bh=TZUiuAzm+1ya94tYB79Hd8qPsMms/+x+7w5nvNtpKIw=; h=From:To:Subject; b=WIaZr97s+JNOX4LiOlLRA8LxvuwLtuVfQVMC4zAFBYHVPzCN8r3Yklk6wQAK4+OQy 0sAefXrNIVzhK0yU06ukL2IseHvzZGIPBMF06zGX+wOdoBbpelMwKRsvPyCNzZqPlZ Vt2ZEOC7V9mD2A2WRO6l21ShIVWMjvAlFZ3I9LKw= 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 ; 22 Aug 2019 20:59:23 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:09 +0200 Message-Id: <20190822185911.12336-6-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: e8ae894e5d33b1c5954e795b96f7bb01 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [wUM0] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_115925_362254_B87B7C96 X-CRM114-Status: UNSURE ( 6.19 ) 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -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 5/7] 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 --- 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 3af1f2676e..c696aac3a8 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -223,6 +223,7 @@ define Device/ubnt_routerstation UBNT_TYPE := RSx UBNT_CHIP := ar7100 DEVICE_PACKAGES += -swconfig + SUPPORTED_DEVICES += routerstation endef TARGET_DEVICES += ubnt_routerstation @@ -232,6 +233,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 c1cd347baf..b4e709de3e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -648,6 +648,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 From patchwork Thu Aug 22 18:59:10 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: 1151753 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="J2wWC0lK"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="OvgOd59I"; 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 46Dv3w2PWNz9sBF for ; Fri, 23 Aug 2019 05:00:12 +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=Lz3YpkQvaMwG8RBk4yr0hthjJk5xcM16xkcXGBAtFg0=; b=J2wWC0lKnTo69I5yB0Wa3KpfsG tcEf+Mp+LKdlc0sNGjdn+efSvuNuL2JvLzoXnK/tjGmwsVkeNr7hpoFRXYBSE9r6IwS81LXHEzCiB wrfefTsMdYObDNCZFWj59VEvc5Vc9pi918QAR2bj/8rAbljmVeuRhcetGKeVXTIgo0JrPKeqqDKuc UMK/CMYBtDZrFki9TR9Jgr/9TLu9EdUA+HxblHgN9OltCy+/IlZcyJHhc8Wk5RYLNF5AF2N3/Fhom oy0BsdNud2h41kDym1GtLrEIF6w9H+fSMJlOv0zJ/ira6FQ45I6IhOlm0AaGjV7C4EMJNA/ilGHHx u/cCAMNA==; 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 1i0sJW-0002GN-4N; Thu, 22 Aug 2019 19:00:02 +0000 Received: from mx-out.tlen.pl ([193.222.135.148]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sIv-0001YS-RA for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 18:59:27 +0000 Received: (wp-smtpd smtp.tlen.pl 30243 invoked from network); 22 Aug 2019 20:59:23 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500363; bh=PkhURra1KW2nP1OmMFB49P84bKwIWD+ZgMMhQXwib4k=; h=From:To:Subject; b=OvgOd59I9pMLFxKICQir7R9V+n1CL7mY+3WOmQATncMBYTeVaQ3C+QrHvVLi7jQkn iBFCKVcBtYiLIVFienO49JfzMk5wjxZTo7sSG+NkIUc749t9pYjI/SolE0EUckRDpl SH/MzUB7mniYKtuXyB/Sf4SKliRfVn6upk5kSQBM= 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 ; 22 Aug 2019 20:59:23 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:10 +0200 Message-Id: <20190822185911.12336-7-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 7c7c8fd25e1af1707ca8363a69589986 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [EfPU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_115926_058015_5C90F222 X-CRM114-Status: GOOD ( 11.73 ) 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 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -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 6/7] ath79: fix FIS partition detection for 4.19 kernel 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 When bumping to 4.19 the patch responsible for scaning flash for FIS partition got left out. Without it devices with RedBoot bootloader using automatic partitions detection in dts won't boot with the new kernel. Fixes: 3771176 ("ath79: add support for linux 4.19") Signed-off-by: Tomasz Maciej Nowak --- .../408-mtd-redboot_partition_scan.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 target/linux/ath79/patches-4.19/408-mtd-redboot_partition_scan.patch diff --git a/target/linux/ath79/patches-4.19/408-mtd-redboot_partition_scan.patch b/target/linux/ath79/patches-4.19/408-mtd-redboot_partition_scan.patch new file mode 100644 index 0000000000..cd41e7ceb2 --- /dev/null +++ b/target/linux/ath79/patches-4.19/408-mtd-redboot_partition_scan.patch @@ -0,0 +1,44 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -76,12 +76,18 @@ static int parse_redboot_partitions(stru + static char nullstring[] = "unallocated"; + #endif + ++ buf = vmalloc(master->erasesize); ++ if (!buf) ++ return -ENOMEM; ++ ++ restart: + if ( directory < 0 ) { + offset = master->size + directory * master->erasesize; + while (mtd_block_isbad(master, offset)) { + if (!offset) { + nogood: + printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); ++ vfree(buf); + return -EIO; + } + offset -= master->erasesize; +@@ -94,10 +100,6 @@ static int parse_redboot_partitions(stru + goto nogood; + } + } +- buf = vmalloc(master->erasesize); +- +- if (!buf) +- return -ENOMEM; + + printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", + master->name, offset); +@@ -170,6 +172,11 @@ static int parse_redboot_partitions(stru + } + if (i == numslots) { + /* Didn't find it */ ++ if (offset + master->erasesize < master->size) { ++ /* not at the end of the flash yet, maybe next block :) */ ++ directory++; ++ goto restart; ++ } + printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", + master->name); + ret = 0; From patchwork Thu Aug 22 18:59:11 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: 1151760 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="PzmH31cf"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="RFANiXIT"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.b="epikcDBY"; 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 46Dv5T6pSqz9sBF for ; Fri, 23 Aug 2019 05:01:33 +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:Cc: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:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g9G1e48GkR2loBmtQgqWxXX1h4fHIYkNTZRyydkoajk=; b=PzmH31cfrrHTsc VRKh7TkXcMU3OLLGS9s0MBx293jH8VobDMwai+VNWMH2Tk7U+lzr6iWF1vLIxYNPzbz4YhfJWcM3R ShxAM1BIOrCBxSxjluxzG+jsvPoQTmy5OOs5OiYU1/5dmM/Met2Gauj+6Nmz/elxkENlJMszMXjoX Eq1D6W4kjoJcwk4+JmYPG62X0/tKrZ0l8pyAJazEvZh9y6LM0yfk0TB9ED6P7SiNGlPvE5I17Uazp q5WmfaJak3DIb2pG0pj5L71nxz50pd3jVgm0Cowd1dlHucBDO/ykmCh9wqGMUeZLtrfMSbTIus0AJ Mug445U863o2Ae8xwB2g==; 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 1i0sKq-0004rP-Hr; Thu, 22 Aug 2019 19:01:24 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sJa-0002uY-VP for openwrt-devel@bombadil.infradead.org; Thu, 22 Aug 2019 19:00:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8v5OEq6XzmFpRNTGiFPhfU04nAIxPVRY8lSLa8MsdQ4=; b=RFANiXIT6QBHlJINZcpeROmLZa B1lS5hycZypf/wi1IniQjlGx7DIh043DFfcGB0WXHbLBeoz0qyFzJYd3QFwD/PloNyXfqItxfBK5J 2KxerAgxHtREeOdfPfm8QFqZYAV8hm5+VkEPmWjOpo6bocmrOUGUumrFNPRl4ZJMoJFF2SgZwaqkJ XOgFntO5JEJ6JrCWRg+JbssnEPEHNNL3CqBz+MPzKQjMXoCna2VqGRU8otRolJrIEkbnBt9P+K4dG xTgNQxGiORDjQT7tPB62m2QudibVrTncJ5tFvR4aMJ4jGfQgkX1RQvqg6jSmeO3/GVy19xN8yX1TV HuLLlb5g==; Received: from mx-out.tlen.pl ([193.222.135.148]) by casper.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0sJr-0004Mf-SA for openwrt-devel@lists.openwrt.org; Thu, 22 Aug 2019 19:00:25 +0000 Received: (wp-smtpd smtp.tlen.pl 31231 invoked from network); 22 Aug 2019 20:59:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1566500364; bh=8v5OEq6XzmFpRNTGiFPhfU04nAIxPVRY8lSLa8MsdQ4=; h=From:To:Cc:Subject; b=epikcDBYgS7drpgGrSZjp463YbeTqmTnbCkyVjrrkxdwqrKv+hUsxVBmHliWnU06b 8VbhhfnksSS4QEZX9CFuBiEtqNUBsV9zt6F5qSnKCc5bpIf/EF5wyjiAh4ap5DEMjA ujT4s95TAXbO+Ycu+jk2HKq1ph49X8NDAYvjiqNk= 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 ; 22 Aug 2019 20:59:24 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Thu, 22 Aug 2019 20:59:11 +0200 Message-Id: <20190822185911.12336-8-tomek_n@o2.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822185911.12336-1-tomek_n@o2.pl> References: <20190822185911.12336-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 8c307d83282cdb0ccf13347f66d8d70d X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [cXPl] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_200024_001350_CD60E66C X-CRM114-Status: GOOD ( 10.31 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on casper.infradead.org summary: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 Subject: [OpenWrt-Devel] [PATCH 7/7] ath79: image: disable sysupgrade images 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: , Cc: Matt Merhar Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Because a bug in handling partial erase blocks in 4.19 kernel, using sysupgrade images will hard brick devices that use RedBoot bootloader and have "FIS directory" with "RedBoot config" on the same erase block. Since flashing the devices from bootloader is safe, and to not cause a situation where external chip programmer or JTAG is needed, disable sysupgrade images for affected boards while creating kernel.bin and rootfs.bin for jjPlus JA76PF2 board, which doesn't have factory image. To set up the JA76PF2 board follow "Installation" instructions in b3a0c97 ("ath79: add support for jjPlus JA76PF2") except the part of loading initramfs image and using sysupgrade image for flashing (point 6 and 7). Enter following commands to flash the board from bootloader: fis init load -r -b 0x80060000 fis create linux load -r -b %{FREEMEMLO} fis create rootfs fis load -l linux exec -c "" For RouterStations use TFTP recovery procedure. Ref: FS#2428 Cc: Matt Merhar Signed-off-by: Tomasz Maciej Nowak --- target/linux/ath79/image/generic-ubnt.mk | 2 +- target/linux/ath79/image/generic.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index c696aac3a8..fd61261193 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -208,7 +208,7 @@ define Device/ubnt_routerstation_common DEVICE_VENDOR := Ubiquiti ATH_SOC := ar7161 IMAGE_SIZE := 16128k - IMAGES += factory.bin + IMAGES := factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | 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 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index b4e709de3e..437265a707 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -643,6 +643,9 @@ define Device/jjplus_ja76pf2 DEVICE_VENDOR := jjPlus DEVICE_MODEL := JA76PF2 DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools fconfig + IMAGES := kernel.bin rootfs.bin + IMAGE/kernel.bin := append-kernel + IMAGE/rootfs.bin := append-rootfs | pad-rootfs 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)