From patchwork Wed Jun 10 20:15:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 1307184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=linux-ipv6.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=sGlUO9zP; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8 header.b=ORIR1pbx; 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 49hysk1jtMz9sSn for ; Thu, 11 Jun 2020 06:15: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: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=2mwXPVr3ECLKRgwoRAUdi0rXRwh1MOulDDMZUbfErxQ=; b=sGlUO9zPmKSW/1 q8UTWLD+Rjv18rYHs2H1WwYshiumvhI9HwTyueHKxhu3/6GcWeIF3hdRh0yrSdEBikO/2An5rs6o4 gtWugdxugRK9EUVg6unzhMwq2nnLCSMDUdjeEKaTnndolrcMi99wFoYyvqmQwPLvwelrsGxjvEAsG Ycgyuaa0XojsydqfI8Yv8hs0HwbTZ9XKAvSw6IpaOe5lVVFNv1eiLfEq4VajE6ih3CRVSIsmLfXxI 6z9/+k+8s+XdtqYGVHp9ZbJ4Gx0SiDW0u5X6Q3eHMl6wSyrrRdc/Zr0WTejmz/NW9Y5dHJtyoOrHB jwRUrdTVIamrdC3OqC+A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj77z-0006IB-DN; Wed, 10 Jun 2020 20:15:15 +0000 Received: from mail.tintel.eu ([2001:41d0:a:6e77:0:ff:fe5c:6a54]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj77u-0004gC-Po for openwrt-devel@lists.openwrt.org; Wed, 10 Jun 2020 20:15:13 +0000 Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 844294495F8E; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id QxN6eTRI-dE5; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 313D84495F90; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu 313D84495F90 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be; s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1591820104; bh=FVifDDN42dgO+9VLPIrTi7V5PK64Hs5UxG6BqS0bBR8=; h=From:To:Date:Message-Id:MIME-Version; b=ORIR1pbx36y17cd18NMVMa9TYibKIbTRyHiPLJG2trjHMWzVUsY6hsOoqcrHypd7L H0zbUv1kQIoVfDdNl3+bB9DM2xmQCFBR+2FyN5G3bcZC4upvbVkNArSkv2t7N79oWr z6pJIzWx378eS8Jj7FZoTUqwJdsFSGnUV2I1bqC4= X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id bidzWi0hGw2r; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20:52bf:b29c:6e1e:7c70]) by mail.tintel.eu (Postfix) with SMTP id E13BD44881EA; Wed, 10 Jun 2020 22:15:03 +0200 (CEST) Received: (nullmailer pid 4175410 invoked by uid 1000); Wed, 10 Jun 2020 20:15:02 -0000 From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Date: Wed, 10 Jun 2020 23:15:00 +0300 Message-Id: <20200610201502.4175358-2-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200610201502.4175358-1-stijn@linux-ipv6.be> References: <20200610201502.4175358-1-stijn@linux-ipv6.be> MIME-Version: 1.0 X-Rspamd-Queue-Id: E13BD44881EA X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]; IP_WHITELIST(0.00)[2001:67c:21bc:20:52bf:b29c:6e1e:7c70] X-Rspamd-Server: skulls X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200610_131511_149047_52474E4F X-CRM114-Status: UNSURE ( 6.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid Subject: [OpenWrt-Devel] [PATCH v2 1/3] mtd: enable wrgg support for ath79 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: mail@adrianschmutzler.de Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is required for the D-Link DAP-2695-A1. Signed-off-by: Stijn Tintel --- package/system/mtd/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/system/mtd/src/Makefile b/package/system/mtd/src/Makefile index e504a04478..6da31a04a4 100644 --- a/package/system/mtd/src/Makefile +++ b/package/system/mtd/src/Makefile @@ -8,7 +8,7 @@ obj.wrg = wrg.o md5.o obj.wrgg = wrgg.o md5.o obj.tpl = tpl_ramips_recoveryflag.o obj.ar71xx = trx.o $(obj.seama) $(obj.wrgg) -obj.ath79 = $(obj.seama) +obj.ath79 = $(obj.seama) $(obj.wrgg) obj.gemini = $(obj.wrgg) obj.brcm = trx.o obj.bcm47xx = $(obj.brcm) From patchwork Wed Jun 10 20:15:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 1307183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=linux-ipv6.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=BAh1W6gu; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8 header.b=mwIGY2S3; 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 49hysX4g2wz9sSc for ; Thu, 11 Jun 2020 06:15:28 +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=T0H5fusvtd9F6sHT8qE5Lj62ueCsZRa9xUCe9dys5Zw=; b=BAh1W6gujLqJNs Ega514BiEjcpqjUlBYDHymUCzjlalRtuo4beuEw+g5BfJNaSmSwGwqG2jUJzDzML3OAjdHGqncdpp rV9SSgM5sfnliFbsejjZtrpSqmVkyay3GnA4xjJ1hgpdWp8KS0rbMzVcfh4DLhdvYwUNPER8Rzepa poh6Yh+YzRlql0L9juqxc0AqiOFMU7h5BYIaksYxKL+zRgMIqMqZ0lYI0R0hgJ0yk67LrnJWmbpJj WeiI1aVTODSCI5NyHD5RFUTW0s9dvq05p6sKBBAY19cyC/BqERTXcDHZ5/d3AQSYauD5cauMBtfoJ MZ5hlUSdZJJBB7ZxZBsg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj78A-0006U1-H7; Wed, 10 Jun 2020 20:15:26 +0000 Received: from mail.tintel.eu ([51.83.127.189]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj77u-0004hj-RI for openwrt-devel@lists.openwrt.org; Wed, 10 Jun 2020 20:15:13 +0000 Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 0C1734495F90; Wed, 10 Jun 2020 22:15:05 +0200 (CEST) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id GrlYfYrvcSAw; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id B60794495F92; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu B60794495F92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be; s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1591820104; bh=XZJlcZf5YehMDdFpE1P14e6rikidVmjwEkZuR39zXbg=; h=From:To:Date:Message-Id:MIME-Version; b=mwIGY2S3xrHvu+xDtoxkQmeDgP4XUeJdEUFAp7gVw80OnM4XRyES4tP8xLY6BbVPq Pas3PJ5Ts25SWeMZHu29iQfWPF8HVGCNWexTFJFMqb1yFkjI4HHFrOfEGTwVZPbs7T TA2oNlzZ5v7+6VKHIZqV0ASdQmNCUKhapHQ+pL6U= X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id QolG9UytKLYR; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20:52bf:b29c:6e1e:7c70]) by mail.tintel.eu (Postfix) with SMTP id 71D0B44881EA; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: (nullmailer pid 4175412 invoked by uid 1000); Wed, 10 Jun 2020 20:15:02 -0000 From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Date: Wed, 10 Jun 2020 23:15:01 +0300 Message-Id: <20200610201502.4175358-3-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200610201502.4175358-1-stijn@linux-ipv6.be> References: <20200610201502.4175358-1-stijn@linux-ipv6.be> MIME-Version: 1.0 X-Rspamd-Queue-Id: 71D0B44881EA X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]; IP_WHITELIST(0.00)[2001:67c:21bc:20:52bf:b29c:6e1e:7c70] X-Rspamd-Server: skulls X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200610_131511_151700_5DCDDFE7 X-CRM114-Status: UNSURE ( 5.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid Subject: [OpenWrt-Devel] [PATCH v2 2/3] ath79: enable wrgg MTD splitter 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: mail@adrianschmutzler.de Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is required for the D-Link DAP-2695-A1. Signed-off-by: Stijn Tintel --- target/linux/ath79/config-4.19 | 1 + target/linux/ath79/config-5.4 | 1 + 2 files changed, 2 insertions(+) diff --git a/target/linux/ath79/config-4.19 b/target/linux/ath79/config-4.19 index cfa0ebd759..81fd017aba 100644 --- a/target/linux/ath79/config-4.19 +++ b/target/linux/ath79/config-4.19 @@ -171,6 +171,7 @@ CONFIG_MTD_SPLIT_LZMA_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_TPLINK_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y +CONFIG_MTD_SPLIT_WRGG_FW=y CONFIG_MTD_VIRT_CONCAT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ath79/config-5.4 b/target/linux/ath79/config-5.4 index 80f7209b5b..b458edce1e 100644 --- a/target/linux/ath79/config-5.4 +++ b/target/linux/ath79/config-5.4 @@ -178,6 +178,7 @@ CONFIG_MTD_SPLIT_LZMA_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_TPLINK_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y +CONFIG_MTD_SPLIT_WRGG_FW=y CONFIG_MTD_VIRT_CONCAT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y From patchwork Wed Jun 10 20:15:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 1307186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=linux-ipv6.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=MuEpQkO2; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8 header.b=pO2Qiwt3; 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 49hyt74Mtmz9sSg for ; Thu, 11 Jun 2020 06:15:59 +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=0e45Watt0fNz/0/xuGjfp4HKmGdsaD6JMqdzkHlpsoE=; b=MuEpQkO2c4EVBW MrCK00DHBCqulJEB6yTuAsQu3S2bpPuoUUIBhjIVovgq0L5kd6NqUldCRCSW9SyI3qej/Gh15ygx5 3VRKClV/bXL47Nt9j/Izo8z44X54/aag65rAybXvWU0e4enHOSOUHfQBv6IkgWp8lcYaJg4MheBwa 1iPheWVzihwOrEiw2YvmQcuPQOzdTc7F2SNfEcAPlV2HfUY7pWL34QU0t+3jx0io5wMr9ryUeCOpz MGErBvSsW0FAnR7kQHbvDXP5XkuYzA1vVtBXEQN/1Rcs1CS8kqhplf1WpurC+jMNgtmtZVRGsxrYS K/GFtbhN6Us/j5t6HlrA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj78V-000702-Tp; Wed, 10 Jun 2020 20:15:47 +0000 Received: from mail.tintel.eu ([51.83.127.189]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj77u-00050N-S3 for openwrt-devel@lists.openwrt.org; Wed, 10 Jun 2020 20:15:15 +0000 Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 197B044881EA; Wed, 10 Jun 2020 22:15:06 +0200 (CEST) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id yz0ktCfYMkyB; Wed, 10 Jun 2020 22:15:05 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 4F5934495F92; Wed, 10 Jun 2020 22:15:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu 4F5934495F92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be; s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1591820105; bh=rZGmJ2zYRYSxqt9gEflnFN1r/efocALSi87CtdEAv5I=; h=From:To:Date:Message-Id:MIME-Version; b=pO2Qiwt3f0IG+Q/odKxdVKYZUXwB/mkV3dd6Razybg20DLQHGZKC9h8VcKZMfMFAv +3UMKcaW8WXCkBwcGLgFozPOpzOi80rKFjLZQiqxPZgokNGkrKdPGNEIo8oeEJYIo+ /0wfwzApZN1bUWsJA6Vxj1bF7Dqko43siTlEu7Q0= X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id igqNcAlReh05; Wed, 10 Jun 2020 22:15:05 +0200 (CEST) Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20:52bf:b29c:6e1e:7c70]) by mail.tintel.eu (Postfix) with SMTP id EDE6B44881EA; Wed, 10 Jun 2020 22:15:04 +0200 (CEST) Received: (nullmailer pid 4175414 invoked by uid 1000); Wed, 10 Jun 2020 20:15:02 -0000 From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Date: Wed, 10 Jun 2020 23:15:02 +0300 Message-Id: <20200610201502.4175358-4-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200610201502.4175358-1-stijn@linux-ipv6.be> References: <20200610201502.4175358-1-stijn@linux-ipv6.be> MIME-Version: 1.0 X-Rspamd-Queue-Id: EDE6B44881EA X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]; IP_WHITELIST(0.00)[2001:67c:21bc:20:52bf:b29c:6e1e:7c70] X-Rspamd-Server: skulls X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200610_131511_202758_37637D99 X-CRM114-Status: GOOD ( 11.90 ) X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 NUMERIC_HTTP_ADDR URI: Uses a numeric IP address in URL 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid Subject: [OpenWrt-Devel] [PATCH v2 3/3] ath79: add support for D-Link DAP-2695-A1 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: mail@adrianschmutzler.de Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Hardware: * SoC: Qualcomm Atheros QCA9558 * RAM: 256MB * Flash: 16MB SPI NOR * Ethernet: 2x 10/100/1000 (1x 802.3at PoE-PD) * WiFi 2.4GHz: Qualcomm Atheros QCA9558 * WiFi 5GHz: Qualcomm Ahteros QCA9880-2R4E * LEDS: 1x 5GHz, 1x 2.4GHz, 1x LAN1(POE), 1x LAN2, 1x POWER * Buttons: 1x RESET * UART: 1x RJ45 RS-232 Console port Installation via stock firmware: * Install the factory image via the stock firmware web interface Installation via bootloader Emergency Web Server: * Connect your PC to the LAN1(PoE) port * Configure your PC with IP address 192.168.0.90 * Open a serial console to the Console port (115200,8n1) * Press "q" within 2s when "press 'q' to stop autoboot" appears * Open http://192.168.0.50 in a browser * Upload either the factory or the sysupgrade image * Once you see "write image into flash...OK,dest addr=0x9f070000" you can power-cycle the device. Ignore "checksum bad" messages. Setting the MAC addresses for the ethernet interfaces via /etc/board.d/02_network adds the following snippets to /etc/config/network: config device 'lan_eth0_1_dev' option name 'eth0.1' option macaddr 'xx:xx:xx:xx:xx:xx' config device 'wan_eth1_2_dev' option name 'eth1.2' option macaddr 'xx:xx:xx:xx:xx:xx' This would result in the proper MAC addresses being set for the VLAN subinterfaces, but the parent interfaces would still have a random MAC address. Using untagged VLANs could solve this, but would still leave those extra snippets in /etc/config/network, and then the device VLAN setup would differ from the one used in ar71xx. Therefore, the MAC addresses of the ethernet interfaces are being set via preinit instead. Signed-off-by: Stijn Tintel --- .../ath79/dts/qca9558_dlink_dap-2695-a1.dts | 178 ++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 6 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 4 + .../etc/uci-defaults/09_fix-checksum | 8 + .../base-files/lib/preinit/10_fix_eth_mac.sh | 4 + target/linux/ath79/image/generic.mk | 33 ++++ 7 files changed, 237 insertions(+) create mode 100644 target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts new file mode 100644 index 0000000000..8d8c796ed8 --- /dev/null +++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts @@ -0,0 +1,178 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca955x.dtsi" + +/ { + compatible = "dlink,dap-2695-a1", "qca,qca9557"; + model = "D-link DAP-2695-A1"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_green; + led-upgrade = &led_power_red; + }; + + leds { + compatible = "gpio-leds"; + + led_power_green: power_green { + label = "d-link:green:power"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + led_power_red: power_red { + label = "d-link:red:power"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + wifi2g { + label = "d-link:green:wifi2g"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + }; + + keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + reset@0 { + label = "reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&spi { + status = "okay"; + num-cs = <1>; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "mx25l12805d"; + reg = <0>; + spi-max-frequency = <25000000>; + partitions { + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@40000 { + label = "bdcfg"; + reg = <0x040000 0x010000>; + read-only; + }; + + partition@50000 { + label = "rgdb"; + reg = <0x050000 0x010000>; + read-only; + }; + + partition@60000 { + label = "langpack"; + reg = <0x060000 0x010000>; + read-only; + }; + + partition@70000 { + compatible = "wrg"; + label = "firmware"; + reg = <0x070000 0xf00000>; + }; + + partition@f70000 { + label = "captival"; + reg = <0xf70000 0x070000>; + read-only; + }; + + partition@fe0000 { + label = "certificate"; + reg = <0xfe0000 0x010000>; + read-only; + }; + + art: partition@ff0000 { + label = "art"; + reg = <0xff0000 0x010000>; + read-only; + }; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy0: ethernet-phy@0 { + reg = <0>; + + qca,ar8327-initvals = < + 0x04 0x07600000 /* PORT0_PAD_CTRL */ + 0x0c 0x00080080 /* PORT6_PAD_CTRL */ + 0x7c 0x0000007e /* PORT0_STATUS */ + 0x94 0x0000007e /* PORT6_STATUS */ + >; + }; +}; + +ð0 { + status = "okay"; + + phy-handle = <&phy0>; + phy-mode = "rgmii"; + pll-data = <0x56000000 0x00000101 0x00001616>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +ð1 { + status = "okay"; + + phy-mask = <0>; + phy-mode = "sgmii"; + pll-data = <0x03000101 0x00000101 0x00001616>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&pcie0 { + status = "okay"; +}; + +&uart { + status = "okay"; +}; + +&wmac { + status = "okay"; + + qca,no-eeprom; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 1672f093a7..d5964e9a0f 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -136,6 +136,9 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "2:wan" "3:lan" "4:lan" ;; + dlink,dap-2695-a1) + ucidef_add_switch "switch0" "0@eth0" "2:lan" "3:wan" "6@eth1" + ;; dlink,dir-825-b1) ucidef_set_interface_wan "eth1" ucidef_add_switch "switch0" \ @@ -359,6 +362,9 @@ ath79_setup_macs() devolo,magic-2-wifi) label_mac=$(macaddr_add "$(mtd_get_mac_binary art 0x1002)" 3) ;; + dlink,dap-2695-a1) + label_mac=$(mtd_get_mac_ascii bdcfg "wlanmac") + ;; dlink,dir-825-b1) lan_mac=$(mtd_get_mac_text "caldata" 0xffa0) wan_mac=$(mtd_get_mac_text "caldata" 0xffb4) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index e0fa5ff354..972157604d 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -14,6 +14,10 @@ case "$FIRMWARE" in avm,fritz450e) caldata_extract_reverse "urlader" 0x1541 0x440 ;; + dlink,dap-2695-a1) + caldata_extract "art" 0x1000 0x440 + ath9k_patch_mac $(mtd_get_mac_ascii bdcfg "wlanmac") + ;; dlink,dir-505|\ dlink,dir-825-c1|\ dlink,dir-835-a1) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 29815a1ada..603557d6c2 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -40,6 +40,10 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) -1) ;; + dlink,dap-2695-a1) + caldata_extract "art" 0x5000 0x844 + ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a) + ;; dlink,dir-859-a1) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac") diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum index 22c9483e74..085ad2e925 100644 --- a/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum +++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum @@ -6,9 +6,17 @@ fix_seama_header() { [ "$kernel_size" ] && mtd -c 0x$kernel_size fixseama firmware } +fixwrgg() { + local kernel_size=$(sed -n 's/mtd[0-9]*: \([0-9a-f]*\).*"kernel".*/\1/p' /proc/mtd) + [ "$kernel_size" ] && mtd -c 0x$kernel_size fixwrgg firmware +} + board=$(board_name) case "$board" in +dlink,dap-2695-a1) + fixwrgg + ;; qihoo,c301) fix_seama_header ;; diff --git a/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh b/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh index da1583a825..59fd36b2e9 100644 --- a/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh +++ b/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh @@ -8,6 +8,10 @@ preinit_set_mac_address() { avm,fritz450e) ip link set dev eth0 address $(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) ;; + dlink,dap-2695-a1) + ip link set dev eth0 address $(mtd_get_mac_ascii bdcfg "lanmac") + ip link set dev eth1 address $(mtd_get_mac_ascii bdcfg "wanmac") + ;; enterasys,ws-ap3705i) ip link set dev eth0 address $(mtd_get_mac_ascii u-boot-env0 ethaddr) ;; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 45dfc6bdad..c865542639 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -6,6 +6,7 @@ include ./common-yuncore.mk DEVICE_VARS += ADDPATTERN_ID ADDPATTERN_VERSION DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK DEVICE_VARS += KERNEL_INITRAMFS_PREFIX +DEVICE_VARS += DAP_SIGNATURE define Build/add-elecom-factory-initramfs $(eval edimax_model=$(word 1,$(1))) @@ -49,6 +50,14 @@ define Build/cybertan-trx -rm $@-empty.bin endef +define Build/mkwrggimg + $(STAGING_DIR_HOST)/bin/mkwrggimg -b \ + -i $@ -o $@.imghdr -d /dev/mtdblock/1 \ + -m $(DEVICE_MODEL)-$(DEVICE_VARIANT) -s $(DAP_SIGNATURE) \ + -v $(VERSION_DIST) -B $(REVISION) + mv $@.imghdr $@ +endef + define Build/nec-enc $(STAGING_DIR_HOST)/bin/nec-enc \ -i $@ -o $@.new -k $(1) @@ -88,6 +97,10 @@ define Build/teltonika-fw-fake-checksum dd of=$@ bs=1 count=16 seek=$$offs conv=notrunc endef +define Build/wrgg-pad-rootfs + $(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@ +endef + define Device/seama KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma KERNEL_INITRAMFS := $$(KERNEL) | seama @@ -458,6 +471,26 @@ define Device/devolo_magic-2-wifi endef TARGET_DEVICES += devolo_magic-2-wifi +define Device/dlink_dap-2695-a1 + SOC := qca9558 + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DAP-2965 + DEVICE_VARIANT := A1 + IMAGES := factory.img sysupgrade.bin + IMAGE_SIZE := 15360k + IMAGE/default := append-kernel | pad-offset 65536 160 + IMAGE/factory.img := $$(IMAGE/default) | append-rootfs | wrgg-pad-rootfs | \ + mkwrggimg | check-size + IMAGE/sysupgrade.bin := $$(IMAGE/default) | mkwrggimg | append-rootfs | \ + wrgg-pad-rootfs | append-metadata | check-size + KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma + KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg + DAP_SIGNATURE := wapac02_dkbs_dap2695 + SUPPORTED_DEVICES += dap-2695-a1 +endef +TARGET_DEVICES += dlink_dap-2695-a1 + define Device/dlink_dir-505 SOC := ar9330 DEVICE_VENDOR := D-Link