From patchwork Mon Jan 2 23:25:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720847 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ue1ndfer; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=NcYQihKz; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmBzc3GR1z23f3 for ; Tue, 3 Jan 2023 10:34:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=xm/W00YbF7K40cBrt/bLneAAumdsXJX7+X/VTsnZ41U=; b=ue1ndferpgDVKR YDQweWLMRH48MmRfaFyexvwOJ7GQpGEBnmm+9Q77u5GaXug53J0wyZKiZMtwxhOvNPEQ/XaQ032PE YBI4f9/M7/NOsEQlHXl+xxM3E31blbBIVt5C43+TX3lsgtnrC1zYi9a2CHh2RCdTBoCwx/w+k0rPC /n3drQlMji6P2vr8iTZyEmZsWBH7JPvfIQdzvyjC008hFKvmhjS0vG/wEwZLu7YNBsZhtwf94PRYI aA7NtysRNkPj3fWQObzEuKDac8VieNPgoReu4XQF1xyHA0ooieg0qMaMztOhtbUAIROE6R1y2nmUM QI7DWnXFOHfFSqsDOEqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUHJ-00EslA-1L; Mon, 02 Jan 2023 23:31:37 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBg-00Eqoy-58 for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:50 +0000 Received: by mail-pl1-x630.google.com with SMTP id p24so8370480plw.11 for ; Mon, 02 Jan 2023 15:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hQOQQ5L+pTj0NTcV0fw3gM8p7Ktxxvnxmn/A5kpHZn0=; b=NcYQihKzaX1eokPNq+EL+QNTXwZPsmZTgg2+GmrfqSkwW385B2GZUf6Ggpjeri/AEA QrYe6ob4+4pfzg5r/wS6QuJ1GcrC7eMLx/A4F0es1wql6gl2Pave0EOzsjvOQYmSyUAs K9JUJdmn3VsULSEzOOy8WZdw2UZIvEagDPun5R2iQnuadmBjMV75WUlIaBQCRAjrnQVT tXyS1Zuo57oapqFhH61L06lsptcHgKaxMRoWaXFnrFflPYycyHWzCUbT/A0XpyF/GpMW gAE5FCVN82nkddGib8azUSVy6i/L4n94vG7OA+dj5wiSGRRJGKyw7PMOVxjKvb/0GJdT tWkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hQOQQ5L+pTj0NTcV0fw3gM8p7Ktxxvnxmn/A5kpHZn0=; b=GJY9cpK23ZDe70m2SW3+ITSZKqjpLUIOxPXrn67FLFj1cNjrosrEWAfWCIiR1VVAL7 g8lSpy6G6ClwsnSXiLp4tUpIN0mpCsxt+qDRpcd7aW26ln90YI4eYYYitSUMROHjMwqR qprap6b2amXntUnj9YjDf08Gtu78jqamO5x4Jk3VK3ZzcapW7vTL2vY86MfngGVRg5OS aJJqJ+77IidvRGZPw6OXL3lIK0C5YpPmCr2EftedY+PIJjc4/QZqo/RCbqrOvZnNyMuG Um2ZBNFA1liQ26DVorpkbWd7hT8snemoHCjpLtRM/Rcolsi5SXYNiLKw65fafc1zgTh2 3YTw== X-Gm-Message-State: AFqh2kormJNwSLjrIkcPQSsHAgzW1lc+DRl1vvSIZRfxwG/RmMNWqZlv B+3lSKF/jOS+aoWW7HRpUVb/T+KwhRo= X-Google-Smtp-Source: AMrXdXv6ERzkFcB9I4SW+5wCAVn/l8YGM48noUg8MIwX+KdTmvCE7FZJkNlVlUEqFxTq+vlCJ86UUA== X-Received: by 2002:a17:902:8481:b0:192:b5b3:b800 with SMTP id c1-20020a170902848100b00192b5b3b800mr11925201plo.39.1672701941048; Mon, 02 Jan 2023 15:25:41 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id j5-20020a170902da8500b0018b025d9a40sm20628315plx.256.2023.01.02.15.25.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:40 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 1/8] base-files: Remove nand.sh dependency from emmc upgrade Date: Mon, 2 Jan 2023 15:25:27 -0800 Message-Id: <20230102232534.592501-1-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152548_261196_E5BB9F8E X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: emmc_do_upgrade() relies on identify() from the nand.sh upgrade helper. This only works because FEATURES=emmc targets also tend to include FEATURES=nand. Signed-off-by: Brian Norris --- .../base-files/files/lib/upgrade/common.sh | 27 ++++++++++++++++ package/base-files/files/lib/upgrade/emmc.sh | 2 +- package/base-files/files/lib/upgrade/nand.sh | 32 ++ 3 files chan [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:630 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 emmc_do_upgrade() relies on identify() from the nand.sh upgrade helper. This only works because FEATURES=emmc targets also tend to include FEATURES=nand. Signed-off-by: Brian Norris --- .../base-files/files/lib/upgrade/common.sh | 27 ++++++++++++++++ package/base-files/files/lib/upgrade/emmc.sh | 2 +- package/base-files/files/lib/upgrade/nand.sh | 32 ++----------------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 5af061f6a439..53b8865a5788 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -127,6 +127,33 @@ get_magic_fat32() { (get_image "$@" | dd bs=1 count=5 skip=82) 2>/dev/null } +identify_magic_long() { + local magic=$1 + case "$magic" in + "55424923") + echo "ubi" + ;; + "31181006") + echo "ubifs" + ;; + "68737173") + echo "squashfs" + ;; + "d00dfeed") + echo "fit" + ;; + "4349"*) + echo "combined" + ;; + "1f8b"*) + echo "gzip" + ;; + *) + echo "unknown $magic" + ;; + esac +} + part_magic_efi() { local magic=$(get_magic_gpt "$@") [ "$magic" = "EFI PART" ] diff --git a/package/base-files/files/lib/upgrade/emmc.sh b/package/base-files/files/lib/upgrade/emmc.sh index c3b02864aa91..49cffe1c658b 100644 --- a/package/base-files/files/lib/upgrade/emmc.sh +++ b/package/base-files/files/lib/upgrade/emmc.sh @@ -58,7 +58,7 @@ emmc_copy_config() { } emmc_do_upgrade() { - local file_type=$(identify $1) + local file_type=$(identify_magic_long "$(get_magic_long "$1")") case "$file_type" in "fit") emmc_upgrade_fit $1;; diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index a8e3cab0b8b1..a1dbd6e2663d 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -65,40 +65,12 @@ get_magic_long_tar() { (tar xO${3}f "$1" "$2" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null } -identify_magic() { - local magic=$1 - case "$magic" in - "55424923") - echo "ubi" - ;; - "31181006") - echo "ubifs" - ;; - "68737173") - echo "squashfs" - ;; - "d00dfeed") - echo "fit" - ;; - "4349"*) - echo "combined" - ;; - "1f8b"*) - echo "gzip" - ;; - *) - echo "unknown $magic" - ;; - esac -} - - identify() { - identify_magic $(nand_get_magic_long "$@") + identify_magic_long $(nand_get_magic_long "$@") } identify_tar() { - identify_magic $(get_magic_long_tar "$@") + identify_magic_long $(get_magic_long_tar "$@") } identify_if_gzip() { From patchwork Mon Jan 2 23:25:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720848 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Y5dD6rQA; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=JIsmuao1; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmC1h1C1Qz23db for ; Tue, 3 Jan 2023 10:36:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cWjFDNKGLI4fkkwavL1biTHCiseURBjn0D27MgqgXyw=; b=Y5dD6rQALDLh3F XVMhFsfjz/qj+irND+kh6GU6ZJ5zf4LIE+G2i9rM3X+2dcB5Qdvfe5AxnwqD571aRtNExpjxo0f1k dz73fB71JCWXdjuhLVQ1ajvav0GhfPj82bBJrQHa2u3bTTKyxmhp0eLN3TmqSg10qwkZdWzsF/8L/ ygciaZbyjaMniKyuSB5CQnfMcqVTfYR3gJVj4B3e3hALF062WoNaGtl4OO8MxWWGt6MyqBnvRKra9 JJXE7BkQvfbLyXYpwADAGOjiOqAidJ16Sz796teTnjNCzKIax4ctHw9KMSnuNNwck74GaJ/NXJmuY Sajd7w3yisLJbi6iKrcw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUJM-00EtgQ-Vw; Mon, 02 Jan 2023 23:33:46 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBg-00EqpW-CG for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:50 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d3so30861967plr.10 for ; Mon, 02 Jan 2023 15:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yDWEAKxS8vh1trdSpyDi/c/MzoJTmKYzLEz/2GfniEo=; b=JIsmuao1dcSo0v6zhPTslgABp+PBTrsp48sDiplQVxNXsGgxdxDg1dvIFP35iE5gBc RRIT7TUuh02ACNzf+MWK2d6Kr6m77V4wBht1tXNDrI+L3eGbQ1z1Mi4cHP4V+fYCDnmr N83le7r9hXEWaqg6IC3UBU4viPh6r+zs4lhbj7jBRfe+/8m3AOjSj5GvY1+v5DK2fCj2 eaQMHMUt1dowE+6UaWhMZcJFJ+EHv671PtkTFNdvCO7qa1cwQcgLB553NUeFXhsQ1XoC SVxUIwPZZIJU0AfA/tsRL386vx4nFMdd96kmHJqPZsazFmbIrCeuyIrCBJd4DPe/0IEf B+1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yDWEAKxS8vh1trdSpyDi/c/MzoJTmKYzLEz/2GfniEo=; b=toM97O82242rCVfwFvLZNr4pWOC02f7i4POoFx5d4qjZl7Nlh0VPvyw80c0QkF+amj PBRV5vxYNa+hkla36BfV7s823U9pb3tl9zryU46SNIoqqleAPSEzNZ+bnyQ/lgz67pmv mXt1Oy0Gk6rWhHNXDZSmqVmhPzswBKQwDUZ2TNvW80HV+Fj0jVfhO/JZdpmyd3f2pp97 9CKPD/uC6PodZFyWVy/FEKZDjLH+8qy2sqbQFlozn8jjs446hm0K2Jj8Xwf8AKVisOEa hqJTOaJEqUxkkcETmJTkRWg14X83ytkbzUQjPTmprSvxT41f3kX5lcPDH/gqrPqXSQRn 4GOA== X-Gm-Message-State: AFqh2kp6nIAeGtt0TUyYbRx5rOZnVGHxYyypurSUp6LLTjoDmV2sT8tj /XJoPAhHJwizUXCQv58WNBCscjHmlbI= X-Google-Smtp-Source: AMrXdXvi6WvNubPyTgrRw1GyD9nSpwh6km3Aufwm4WPw/Dbjw45ttTILwifMFUOf4NGhj8kZPlyR9w== X-Received: by 2002:a17:902:a5ca:b0:191:3aad:cf33 with SMTP id t10-20020a170902a5ca00b001913aadcf33mr41556371plq.55.1672701942925; Mon, 02 Jan 2023 15:25:42 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id i14-20020a170902cf0e00b00186a2444a43sm20682919plg.27.2023.01.02.15.25.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:42 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 2/8] ipq806x: Point to externally compiled dtbs in recipes Date: Mon, 2 Jan 2023 15:25:28 -0800 Message-Id: <20230102232534.592501-2-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152548_608342_E44B7A08 X-CRM114-Status: GOOD ( 17.12 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: See also: commit 4d8b42d8a7774070ac0439915f8de1430db9a8e3 Author: Tomasz Maciej Nowak Date: Thu Aug 25 20:26:11 2022 +0200 ipq40xx: point to externally compiled dtbs in recipes Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62e listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 See also: commit 4d8b42d8a7774070ac0439915f8de1430db9a8e3 Author: Tomasz Maciej Nowak Date: Thu Aug 25 20:26:11 2022 +0200 ipq40xx: point to externally compiled dtbs in recipes Adjusting dts will cause a rebuild of whole kernel as the buildroot considers this a part of kernel source. It's a royal PITA when trying to prepare support for new device, since this takes a lot of time on slower systems. As it stands, buildroot itself, with own rule, also compiles dtbs and the results are $(KDIR)/image-$(DEVICE_DTS).dtb. With setting DEVICE_DTS_DIR to directory holding the device dts (similarly to some other targets), buildroot doesn't consider changed dts as part of kernel source and rebuilds only dtb. This really speeds up development. And since the kernel built dts are no longer used, drop the paches adding dtses to its build. In a similar fashion, we can drop the DTS patch. Signed-off-by: Brian Norris --- target/linux/ipq806x/image/Makefile | 5 +-- .../0069-arm-boot-add-dts-files.patch | 43 ------------------- .../0069-arm-boot-add-dts-files.patch | 43 ------------------- 3 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch delete mode 100644 target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index f4f829b35c65..8c1fc88010cd 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -5,7 +5,6 @@ include $(INCLUDE_DIR)/image.mk define Device/Default PROFILES := Default - KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_LOADADDR = 0x42208000 DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS_CONFIG := config@1 @@ -22,13 +21,13 @@ endef define Device/FitImage KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL_NAME := Image endef define Device/FitImageLzma KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL_NAME := Image endef diff --git a/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch deleted file mode 100644 index 4c42f40e3d78..000000000000 --- a/target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8f68331e14dff9a101f2d0e1d6bec84a031f27ee Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Thu, 9 Mar 2017 11:03:18 +0100 -Subject: [PATCH 69/69] arm: boot: add dts files - -Signed-off-by: John Crispin ---- - arch/arm/boot/dts/Makefile | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -909,8 +909,30 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-ipq4019-ap.dk04.1-c3.dtb \ - qcom-ipq4019-ap.dk07.1-c1.dtb \ - qcom-ipq4019-ap.dk07.1-c2.dtb \ -+ qcom-ipq8062-wg2600hp3.dtb \ - qcom-ipq8064-ap148.dtb \ - qcom-ipq8064-rb3011.dtb \ -+ qcom-ipq8064-c2600.dtb \ -+ qcom-ipq8064-d7800.dtb \ -+ qcom-ipq8064-db149.dtb \ -+ qcom-ipq8064-ap161.dtb \ -+ qcom-ipq8064-ea7500-v1.dtb \ -+ qcom-ipq8064-ea8500.dtb \ -+ qcom-ipq8064-g10.dtb \ -+ qcom-ipq8064-r7500.dtb \ -+ qcom-ipq8064-r7500v2.dtb \ -+ qcom-ipq8064-unifi-ac-hd.dtb \ -+ qcom-ipq8064-wg2600hp.dtb \ -+ qcom-ipq8064-wpq864.dtb \ -+ qcom-ipq8064-wxr-2533dhp.dtb \ -+ qcom-ipq8065-nbg6817.dtb \ -+ qcom-ipq8065-r7800.dtb \ -+ qcom-ipq8065-rt4230w-rev6.dtb \ -+ qcom-ipq8065-tr4400-v2.dtb \ -+ qcom-ipq8065-xr500.dtb \ -+ qcom-ipq8068-ecw5410.dtb \ -+ qcom-ipq8068-mr42.dtb \ -+ qcom-ipq8068-mr52.dtb \ - qcom-msm8660-surf.dtb \ - qcom-msm8960-cdp.dtb \ - qcom-msm8974-fairphone-fp2.dtb \ diff --git a/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch deleted file mode 100644 index 698df248fb57..000000000000 --- a/target/linux/ipq806x/patches-5.15/0069-arm-boot-add-dts-files.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8f68331e14dff9a101f2d0e1d6bec84a031f27ee Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Thu, 9 Mar 2017 11:03:18 +0100 -Subject: [PATCH 69/69] arm: boot: add dts files - -Signed-off-by: John Crispin ---- - arch/arm/boot/dts/Makefile | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -957,8 +957,30 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-ipq4019-ap.dk04.1-c3.dtb \ - qcom-ipq4019-ap.dk07.1-c1.dtb \ - qcom-ipq4019-ap.dk07.1-c2.dtb \ -+ qcom-ipq8062-wg2600hp3.dtb \ - qcom-ipq8064-ap148.dtb \ - qcom-ipq8064-rb3011.dtb \ -+ qcom-ipq8064-c2600.dtb \ -+ qcom-ipq8064-d7800.dtb \ -+ qcom-ipq8064-db149.dtb \ -+ qcom-ipq8064-ap161.dtb \ -+ qcom-ipq8064-ea7500-v1.dtb \ -+ qcom-ipq8064-ea8500.dtb \ -+ qcom-ipq8064-g10.dtb \ -+ qcom-ipq8064-r7500.dtb \ -+ qcom-ipq8064-r7500v2.dtb \ -+ qcom-ipq8064-unifi-ac-hd.dtb \ -+ qcom-ipq8064-wg2600hp.dtb \ -+ qcom-ipq8064-wpq864.dtb \ -+ qcom-ipq8064-wxr-2533dhp.dtb \ -+ qcom-ipq8065-nbg6817.dtb \ -+ qcom-ipq8065-r7800.dtb \ -+ qcom-ipq8065-rt4230w-rev6.dtb \ -+ qcom-ipq8065-tr4400-v2.dtb \ -+ qcom-ipq8065-xr500.dtb \ -+ qcom-ipq8068-ecw5410.dtb \ -+ qcom-ipq8068-mr42.dtb \ -+ qcom-ipq8068-mr52.dtb \ - qcom-msm8226-samsung-s3ve3g.dtb \ - qcom-msm8660-surf.dtb \ - qcom-msm8960-cdp.dtb \ From patchwork Mon Jan 2 23:25:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720844 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=lHjg1WBW; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=igJVXZUj; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmBwK2Zvkz23fX for ; Tue, 3 Jan 2023 10:31:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=N1bo3gYP6fMfJwSlUIMn1w1ZZxqnt1i7iJQe7t/sktc=; b=lHjg1WBWKAWaBB uYDwuwQNhP7+rFAndugDzMBxpHkN9WU4Ff/56fdUckMqn/So3kvWHziO3/oOIe2vU91uV6yjDTnA0 8vbsAo5yE+2mKH2chab2ceI7kHIQ6gRv5UC3264H1rfcDX0jiptrFMMArYLaM9uXq+zIxCmng53qS igPMnsdG5GNo7t5WMpJaLvgWtAwcg+zuPR5hnRCVoKbp8Lyf6boEy3iXF2CISjmxReSqW52yDteet /zK0/fffYwumMtkTzn0zMOp9f/BwZ/S7vA9KulYagti74dDPYLYR5FcKDCz/ELDUEBZsLDKNnNF+0 /2B3sIqkejLEcpbe3Y1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUE5-00ErTo-Sh; Mon, 02 Jan 2023 23:28:18 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBg-00Eqpt-H0 for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:51 +0000 Received: by mail-pj1-x102f.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso34272293pjt.0 for ; Mon, 02 Jan 2023 15:25:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rMKrAq64hcqn52c5fW5QY9f1XXOg7ZooATfbyQj2/8s=; b=igJVXZUjzr5CIXnV4j5pslIzET59NGoN1fMC8dy87Qst8rxs0EexZ7Rl5gwwCcOw7L M2N3GdAAKTCT9XkSltMlc3i/ku7Cf2w7Em51QRcYm/aOhCT/BNAxIeBiXuDmB7+zzEyF +V1dgx8JCql4Neq26N0Fb6PipuALd+bEq1IMbcoOEcUMsWG7AVxIbzfvZUS2CafRur8a GSgrxCGDf2ToU0KjZlq1NkezOVs0KSimTyrDT433S9+fBYecLJyBWcsNrbkKdVPhyKzo m9YBDMgjKQtJgL9CHKTjlbQEdsJsCLjUfxOdKDqtHlCA/mwLIVxSd++vKGoUyhxz3bSw P24w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rMKrAq64hcqn52c5fW5QY9f1XXOg7ZooATfbyQj2/8s=; b=mrM2CwoR41Gfx2Hi9IN5C3xfEIT+F6O11uYlJJ/0Y6bDjkjIe0y3i4mbxKfYw9VvCy VvlGj5GqELECenhcMUjLctSJMSepMZVEAlz9SV07GzqJqaTTTLW8jczXSH5BB6EQh+/k xP3jycnc09etvCVkuFMrRsPhZw3wkV4ShwzT17LnwZyyLdC9Vp7tEsdKGwNRwyScbbT+ vhwZTrSX3ScjRoJ3GEZsZNb+cs1Ej24fbhrxdq+1BGTCjORsMl1LZMeDlthOoGtEs+5Z BXMS86rOeeYwmaeGKP3tZTADJ7iPrZSiArxUt8cVSKmSktY/99VtOkN996OOFgAJZPDZ BBhA== X-Gm-Message-State: AFqh2kqB4ZuBzTpsiRvLRBQUYrXPYPjg4z7q/Lkc0pnbTLSJH3K1TKRp IfyEtaLL/faTgHSc0aAToRz9FYwnZCE= X-Google-Smtp-Source: AMrXdXuYCSc6Wd6xSUWKrPFh/GISZWjLISh7gzEfiIH8Gq78a+ZY0+linm0lvt7D7ZfVUNRoJ8pNww== X-Received: by 2002:a05:6a20:8f0c:b0:af:7ed6:9858 with SMTP id b12-20020a056a208f0c00b000af7ed69858mr66239898pzk.31.1672701944467; Mon, 02 Jan 2023 15:25:44 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00192d9258512sm490517plg.154.2023.01.02.15.25.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:44 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 3/8] ipq806x: config-5.15: Normalize Date: Mon, 2 Jan 2023 15:25:29 -0800 Message-Id: <20230102232534.592501-3-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152548_633764_A3B3D8CF X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.0 (+) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Normalize = `make kernel_menuconfig`, save. Signed-off-by: Brian Norris --- target/linux/ipq806x/config-5.15 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) Content analysis details: (1.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:102f listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 1.2 UPPERCASE_75_100 message body is 75-100% uppercase X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 Normalize = `make kernel_menuconfig`, save. Signed-off-by: Brian Norris --- target/linux/ipq806x/config-5.15 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/target/linux/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15 index 7ea97ff89ec3..5082bc840be3 100644 --- a/target/linux/ipq806x/config-5.15 +++ b/target/linux/ipq806x/config-5.15 @@ -34,13 +34,14 @@ CONFIG_ARM_CPU_SUSPEND=y # CONFIG_ARM_CPU_TOPOLOGY is not set CONFIG_ARM_GIC=y CONFIG_ARM_HAS_SG_CHAIN=y +# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set +# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_MODULE_PLTS=y CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_QCOM_CPUFREQ_HW is not set -CONFIG_ARM_QCOM_CPUFREQ_KRAIT=y CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y CONFIG_ARM_QCOM_SPM_CPUIDLE=y # CONFIG_ARM_SMMU is not set @@ -98,13 +99,11 @@ CONFIG_CRC16=y # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_SLICEBY8=y CONFIG_CRC8=y -CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y @@ -112,7 +111,6 @@ CONFIG_CRYPTO_JITTERENTROPY=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA256=y @@ -127,8 +125,6 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set # CONFIG_DEVFREQ_GOV_USERSPACE is not set # CONFIG_DEVFREQ_THERMAL is not set -# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set -# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -143,6 +139,7 @@ CONFIG_DWMAC_IPQ806X=y CONFIG_DYNAMIC_DEBUG=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y +CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FWNODE_MDIO=y @@ -152,10 +149,12 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y @@ -173,6 +172,7 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_VDSO_32=y +CONFIG_GLOB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_CDEV=y CONFIG_GRO_CELLS=y @@ -185,6 +185,7 @@ CONFIG_HAS_IOPORT_MAP=y CONFIG_HAVE_SMP=y CONFIG_HIGHMEM=y # CONFIG_HIGHPTE is not set +CONFIG_HOTPLUG_CPU=y CONFIG_HWMON=y CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_QCOM=y @@ -214,12 +215,12 @@ CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_KMAP_LOCAL=y +CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y CONFIG_KPSS_XCC=y CONFIG_KRAITCC=y CONFIG_KRAIT_CLOCKS=y CONFIG_KRAIT_L2_ACCESSORS=y CONFIG_LIBFDT=y -CONFIG_LLD_VERSION=0 CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LZO_COMPRESS=y @@ -299,6 +300,7 @@ CONFIG_NO_HZ_IDLE=y CONFIG_NR_CPUS=2 CONFIG_NVMEM=y # CONFIG_NVMEM_SPMI_SDAM is not set +CONFIG_NVMEM_SYSFS=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y @@ -307,7 +309,6 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y -CONFIG_OF_NET=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PADATA=y @@ -397,7 +398,7 @@ CONFIG_QCOM_SCM=y # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_QCOM_SMEM=y # CONFIG_QCOM_SMSM is not set -# CONFIG_QCOM_SOCINFO is not set +CONFIG_QCOM_SOCINFO=y CONFIG_QCOM_TCSR=y CONFIG_QCOM_TSENS=y CONFIG_QCOM_WDT=y @@ -452,6 +453,7 @@ CONFIG_SMP_ON_UP=y # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set CONFIG_SOCK_RX_QUEUE_MAPPING=y +CONFIG_SOC_BUS=y CONFIG_SPARSE_IRQ=y CONFIG_SPI=y CONFIG_SPI_MASTER=y From patchwork Mon Jan 2 23:25:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720849 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=EQCqDuYr; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=g8TrYyy1; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmC4N2Zpcz23db for ; Tue, 3 Jan 2023 10:39:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PMYgnTJiKL++DFGA7UgxXWa9YGGcckctFATnT8fg9BQ=; b=EQCqDuYr2ZZQDk hKgauArzN+sDRNLAFwVDtmj94Xo0p14h552+KVum02xOyC1k5ngyiepxUe8oCZjzHlFm6vyQ5dw1l ymMSGKI5zvZwThYU6s3alpWOmj9zISTW/eGq4GTIHbi5c70Daehc/xWaiK1CS6Aefe47MBd73TkzA 2pfFN7nwnuFMBSRKRu+bSj8ke4ifcSoBNiMLU+/meBho7yq6tCHMXuZeOgPUwjof3NZP/ZvPXLSf/ 2OTmJ2fKo6AqtoZlGxEJ667AFqtVJVcf6M1I6rSwTUuUzZ3l8MSqd41WK2LkWx4zGK7LSKVdgRjAk zWgjeVHnTqCUAq+vk0yg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCULf-00EuqQ-3u; Mon, 02 Jan 2023 23:36:10 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBh-00EqqA-CB for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:51 +0000 Received: by mail-pl1-x62d.google.com with SMTP id 17so30931969pll.0 for ; Mon, 02 Jan 2023 15:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gJKLusRBK2Zgai4gn76eYRSCnyrxoZL66UOcWUmY/mM=; b=g8TrYyy1DdrL+La24EJdO5suamovu3rr2gieHjHf29zT+z12NDqu89FxLoZx+d9JiM YCg/+BPIzBEouRJvNIj4ud28fp9tN+w9b9PHms1XbLHK8r+/FfbzjzAnRI+J4qRUP1mG z8oasCawV1dWerOr6l/E4domdUb5wqf+rCDTz2UiXqhqMACMLbE01uF2MMgVEu+MZFJk HYcutm0WXTKO7mmYRIQRG4dK994b2id9Uk8seTU5+NjbqsREX5vBSsUq4oDZxpYjlyKD IPBZKzUo36uoiseD8r0U5oYe6CD66isE8wxPNwD3P9DR+x7uaLeBEMm841Ar0HJjmp8u 3U3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gJKLusRBK2Zgai4gn76eYRSCnyrxoZL66UOcWUmY/mM=; b=Gbf5X0bYYPGGKD8iCIuWv/YeCqclWsDtNDAKszQpqoOExIiGsa+c/6cowEXF2r6N2N 1NeucZvqWsjZhjHszzMGrECwqW4EXYy1Kd3eEsbxH6RYn3ph6JLu2iWqE4clvVZYDqWu j/mMDjbsGnLRZWqn6ThdOGbhXsCCU9AbFupk9w68GzH7m0rj8xqn4HDYD2ADqqTdexsF Xt4Bd4kyTKUct78HiK8l/VMFQjQR0xB83OlHauzaxbHzOCWc3713op6bRqxpZPiTTlFS A2FxdJx5pkXufItosTyRyAPbkOPHb+R4Vy92ezMEI/UPA/O5aEtyMMlxKm3fS6FK5wto P60w== X-Gm-Message-State: AFqh2kpMzNW1hE4+Akou7Grcowaw7PZg1CUg+rRGXTMIfoUFEObFzQ/g fSBPOcMzhU2dqrY059HRR3CIQeTBL0I= X-Google-Smtp-Source: AMrXdXvdMREgbPMFyJHIlur8pWL3OGH4cbnYxwGw/qaQJ5PYfv74enWF1oiWKrG1QabGFS7XdvJAfA== X-Received: by 2002:a17:902:eb4c:b0:192:be8d:7e06 with SMTP id i12-20020a170902eb4c00b00192be8d7e06mr8189526pli.51.1672701946278; Mon, 02 Jan 2023 15:25:46 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id jn18-20020a170903051200b00189393ab02csm12287409plb.99.2023.01.02.15.25.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:46 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 4/8] ipq806x: Enable CONFIG_IPQ_LCC_806X Date: Mon, 2 Jan 2023 15:25:30 -0800 Message-Id: <20230102232534.592501-4-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152549_517313_90D60752 X-CRM114-Status: GOOD ( 11.19 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Clock controller used by some IP blocks (e.g., LPASS / audio) on IPQ8064. Signed-off-by: Brian Norris --- target/linux/ipq806x/config-5.15 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 Clock controller used by some IP blocks (e.g., LPASS / audio) on IPQ8064. Signed-off-by: Brian Norris --- target/linux/ipq806x/config-5.15 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15 index 5082bc840be3..31bb729c85e9 100644 --- a/target/linux/ipq806x/config-5.15 +++ b/target/linux/ipq806x/config-5.15 @@ -207,7 +207,7 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_IPQ_GCC_6018 is not set CONFIG_IPQ_GCC_806X=y # CONFIG_IPQ_GCC_8074 is not set -# CONFIG_IPQ_LCC_806X is not set +CONFIG_IPQ_LCC_806X=y CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y From patchwork Mon Jan 2 23:25:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720843 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=UGvdz+mn; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=hZMQLBFV; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmBwK2WY9z23f3 for ; Tue, 3 Jan 2023 10:32:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3obcsagPWaeOCVmt4xmoyxBr4Tdc8PkAnmIr+Tve+50=; b=UGvdz+mnL+7+NK ZfSDmkBiqgGOxTjX6ryyyMrEVzzTVoZS+sjIcTqBWtjbkqoIoJJJOY/wW1aJnKkmcR8wCFP45FFtm A2l9MAvsDY+kZaU6JqEQDwDEdcp1DhXWb/Q0pknBAbhQPSe54Djn50lWKWiOJ3B9MhWVRCCtatiHT YY1DGxaJ3MDfOLW4/Gex2Y2kMJTGc/7XJ07lWyJOwL6h9NI0KLENQjMXdwZvKC+2rp2VsCKM7ViZQ XacdR+M/Vqj2kGVcpchFV0A9NPpz7rjQZVXZdmpLfzhEv6DTV+icCyQ5zUSpNATsJZlfMbqeEcyx5 OYLNyIWQQuRp1ai0Zx6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUEa-00ErXw-LK; Mon, 02 Jan 2023 23:28:48 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBk-00Eqr2-1D for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:53 +0000 Received: by mail-pl1-x62a.google.com with SMTP id m4so30887525pls.4 for ; Mon, 02 Jan 2023 15:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GqDIEIGLH+KEioSZbtRDfpB9iB16OyDzJmETWQX5+ls=; b=hZMQLBFVndqhVIhHf7DtI299mvUzrhGc0eP5NqWO1qHhGDHTk0xFMkxYPSACakm2QE GkW0cgyIU+nKxitp51mGr0grS3m6MEynLk4t0J+XOJfaodBsZci01PHzQrevhZkxn5fA e3k6uEE6kMdtqNY879b8V/F/1n/NL/O9aMQJx5+EoRO1xw7OjQTAz5Ivq15so9kscUV1 rLskxJan7WmAQFLPjU9Q0rpas+Zf5eNztI6ydGNfKmnu6cpEaiSAXmXHAP7nkvjYKfpH bD2Mj6wZQ/DveZu0dLQZHFuXaO+NTIeC//1Owi9sGqPkmEApDY7js6saugJi46KOjzb4 e7bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GqDIEIGLH+KEioSZbtRDfpB9iB16OyDzJmETWQX5+ls=; b=K0676nMivA+6q1knP7N3huz1l805ZYUh3bBnG+2Bawmx+bYorpRh8A1vXwc7B49Kbt UagFAncQFL/1Qr6jz+640FtimvAL5/D/Vbvd/Dc6RhKDP3bBWJOx/PximTgrAWiFd7hN qfCPfTOotHwPxIZGRvCECxFMOuzoXO9lkT6jK4AU8ID/om9IjmU+jzjpbJqNHx7Z6gG/ 4e+zRj+M7/Ay2SRORF7kZRnaAJHAYvrMOTAvtApCyyfdfIZSFCgf4soxZfiAnqCElUvO 2nagLMztz3tmPqiwPaM4UGBiDori94LNmZV4dxOI8MqbJhEySK5Q6njYPB7wY75TCQpm hbdw== X-Gm-Message-State: AFqh2kqeUwXJpzE/CPZ07qNmxs3sFz/rnmnAQs9ZLzfWas5bMYUSuGrM sHA8WbealedBbdik9y2KyHtwE60qDrk= X-Google-Smtp-Source: AMrXdXuhkE+2D1fK4dV63fAAWSZeLvJtpQbL0UNN/hQ2Xa8UuCqiyr8H9oDlxMYeJsvR9tPF7jbYnA== X-Received: by 2002:a17:90b:3597:b0:219:b1f0:ddf0 with SMTP id mm23-20020a17090b359700b00219b1f0ddf0mr46396475pjb.36.1672701947860; Mon, 02 Jan 2023 15:25:47 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id le14-20020a17090b150e00b00219eefe47c7sm17480814pjb.47.2023.01.02.15.25.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:47 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 5/8] ipq8064: ASoC: qcom: lpass-cpu: Fix fallback SD line index handling Date: Mon, 2 Jan 2023 15:25:31 -0800 Message-Id: <20230102232534.592501-5-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152552_163935_F5F11DEE X-CRM114-Status: GOOD ( 17.53 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This fixes device tree registration for 'qcom,lpass-cpu' as used by qcom-ipq8064 SoCs, and allows speaker audio to function. This patch has been submitted (and merged, for -next) upstream. Signed-off-by: Brian Norris --- Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 fixes device tree registration for 'qcom,lpass-cpu' as used by qcom-ipq8064 SoCs, and allows speaker audio to function. This patch has been submitted (and merged, for -next) upstream. Signed-off-by: Brian Norris --- ...cpu-Fix-fallback-SD-line-index-handl.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch diff --git a/target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch b/target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch new file mode 100644 index 000000000000..0bdab5dc62a5 --- /dev/null +++ b/target/linux/ipq806x/patches-5.15/902-ASoC-qcom-lpass-cpu-Fix-fallback-SD-line-index-handl.patch @@ -0,0 +1,39 @@ +From: Brian Norris +Date: Thu, 15 Dec 2022 01:33:45 -0800 +Subject: [PATCH] ASoC: qcom: lpass-cpu: Fix fallback SD line index handling + +[[ Submitted upstream as: + https://lore.kernel.org/all/20221231061545.2110253-1-computersforpeace@gmail.com/ ]] + +These indices should reference the ID placed within the dai_driver +array, not the indices of the array itself. + +This fixes commit 4ff028f6c108 ("ASoC: qcom: lpass-cpu: Make I2S SD +lines configurable"), which among others, broke IPQ8064 audio +(sound/soc/qcom/lpass-ipq806x.c) because it uses ID 4 but we'd stop +initializing the mi2s_playback_sd_mode and mi2s_capture_sd_mode arrays +at ID 0. + +Fixes: 4ff028f6c108 ("ASoC: qcom: lpass-cpu: Make I2S SD lines configurable") +Cc: +Signed-off-by: Brian Norris +--- + sound/soc/qcom/lpass-cpu.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/sound/soc/qcom/lpass-cpu.c ++++ b/sound/soc/qcom/lpass-cpu.c +@@ -851,10 +851,11 @@ static void of_lpass_cpu_parse_dai_data( + struct lpass_data *data) + { + struct device_node *node; +- int ret, id; ++ int ret, i, id; + + /* Allow all channels by default for backwards compatibility */ +- for (id = 0; id < data->variant->num_dai; id++) { ++ for (i = 0; i < data->variant->num_dai; i++) { ++ id = data->variant->dai_driver[i].id; + data->mi2s_playback_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH; + data->mi2s_capture_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH; + } From patchwork Mon Jan 2 23:25:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720846 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=4vK51/h7; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=NRacYSDC; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmBx23rB5z23f3 for ; Tue, 3 Jan 2023 10:32:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bRh46aEkgydF6VF7z5sCplXZn5QnhCJg1T9aPLCoxoE=; b=4vK51/h741Uyru 8wTq0+pXfNUz4KhPyNKF1neBcp2FoQb6EHmzi5JrH4sxJtRYlDSscPrm4wowbpDTgj/J+V+7W/1Dz I78ow9VTy7RpvNDfVjxR8adIFjTQDKtOyRv9h4KaTe3tRR9XFT30vthx4CrBKsTHVD6g6vQN4N/ko YFclC/VQisbfQTYAumgNXj2mow4mfnU/jlM0Bb/VGZW0Fm5YMhhIAIkz9ZByjBUqAR6ijZn0kxFrx S4rIV+aSJkSzoFSGhA+BkfVDCY+3erkXyJkU0Qca5PyH6a6+UePZQUsIqUKF5na4pDMarZXOPjqmJ cZ2sHpNAGaHgBJP0TWxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUFN-00Erp9-4O; Mon, 02 Jan 2023 23:29:37 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBk-00Eqs9-GO for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:55 +0000 Received: by mail-pg1-x531.google.com with SMTP id 78so19061785pgb.8 for ; Mon, 02 Jan 2023 15:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uXw3lMRU/sobOexiju/OGbG9j3XmwgdO/eZJLWRRZTk=; b=NRacYSDCD3ubKuYuPAW44B2rQwT2yWZjfyVeIQXbV6wK9ANX428xcPiEm/JMu2LOFl 0ugDzCbdHTLAcoiT8YfgPfAWEXmUxY7YZrc5hTRBphOVY589v6W5KR6jVRBHkTGcK3j3 ryk4QkoLiMDgfG7CBW58/ys3k9c+q5RVEgcAIfJi8Px0nJrOwLkocBajVlg3Hr69gMIX xXL/3vY1O62YLPssCEa2A2hDHriZNjA0opS1M545M8dEhDSmGqYgR+tFrborz3DI4iQm +Hx2KKAqjt/n8vFhp3EjMdx6fOAxxD5Su+vXnJZnKWVn0FAMqS/NowsnSjokCqGv+xf3 7Qng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uXw3lMRU/sobOexiju/OGbG9j3XmwgdO/eZJLWRRZTk=; b=jjybHzw8eT+8L0jJteosXY+fcB301gyMyFltE2INcnGh16Xdgu1b34yWioazKgOtw3 vMIgw39sYZwpdQikpOZ8rRsyKNoPVhIqtCetijFTr6Ovah+I00e9v+KeLLAWDcgDv8Dw CO/H25QwZugEntBiWVZjdodGUIW47SStXvdB1Zuk+BDpGOnXHdn9K7OoJPLuKYaWJ171 qJUbYLcjNKRcqh6adHfOPhIjShtolyez+hDe5fwnZMCArCHGxdrKzxuRnR7CyD7dBeqd WaQVdsxWgYUlWxk2tWtq6oyspmE6A7xSISkmiLD1J/pmCEg0d4mqvVk6tP9kx1L26FTj Wu5Q== X-Gm-Message-State: AFqh2krknYKlOsHYp6QsdjTTOq3qDjeUun1ZeokYSfVMgTk0Imi7Ka43 7jTYBLsnBwHxXU5CuEVvLE1oMZ/25x8= X-Google-Smtp-Source: AMrXdXvaQgIROG3mz0PYxuLBkyspPrKHmDo83NqBU4MniLo/eKwaRtX4C242WTdppWtebEbpczcYbw== X-Received: by 2002:a62:f20f:0:b0:56b:b890:6ccd with SMTP id m15-20020a62f20f000000b0056bb8906ccdmr41915165pfh.4.1672701949689; Mon, 02 Jan 2023 15:25:49 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id x5-20020a626305000000b005815017d348sm13213959pfb.179.2023.01.02.15.25.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:49 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 6/8] kernel: Add kmod-sound-soc-ipq8064-storm Date: Mon, 2 Jan 2023 15:25:32 -0800 Message-Id: <20230102232534.592501-6-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152552_695645_F3F5ACB6 X-CRM114-Status: GOOD ( 10.98 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: For IPQ8064 systems based off the "Google Storm" reference platform, such as the TP-Link OnHub. Signed-off-by: Brian Norris --- package/kernel/linux/modules/sound.mk | 24 ++++++++++++++++++++++++ target/linux/generic/config-5.10 | 3 +++ target/linux/generic/config-5.15 | 3 +++ 3 files changed, 30 insertions(+) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:531 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 For IPQ8064 systems based off the "Google Storm" reference platform, such as the TP-Link OnHub. Signed-off-by: Brian Norris --- package/kernel/linux/modules/sound.mk | 24 ++++++++++++++++++++++++ target/linux/generic/config-5.10 | 3 +++ target/linux/generic/config-5.15 | 3 +++ 3 files changed, 30 insertions(+) diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 2bfa146207aa..92ad8bceed9b 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -254,6 +254,30 @@ endef $(eval $(call KernelPackage,sound-soc-imx-sgtl5000)) +define KernelPackage/sound-soc-ipq8064-storm + TITLE:=Qualcomm IPQ8064 SoC support for Google Storm + KCONFIG:=\ + CONFIG_SND_SOC_QCOM \ + CONFIG_SND_SOC_STORM + FILES:=\ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-max98357a.ko \ + $(LINUX_DIR)/sound/soc/qcom/snd-soc-lpass-cpu.ko \ + $(LINUX_DIR)/sound/soc/qcom/snd-soc-lpass-ipq806x.ko \ + $(LINUX_DIR)/sound/soc/qcom/snd-soc-lpass-platform.ko \ + $(LINUX_DIR)/sound/soc/qcom/snd-soc-storm.ko + AUTOLOAD:=$(call AutoLoad,57,snd-soc-max98357a snd-soc-lpass-cpu \ + snd-soc-lpass-ipq806x snd-soc-lpass-platform snd-soc-storm) + DEPENDS:=@TARGET_ipq806x +kmod-sound-soc-core + $(call AddDepends/sound) +endef + +define KernelPackage/sound-soc-ipq8064-storm/description + Support for Qualcomm IPQ8064 / Google Storm Platform sound +endef + +$(eval $(call KernelPackage,sound-soc-ipq8064-storm)) + + define KernelPackage/sound-soc-spdif TITLE:=SoC S/PDIF codec support KCONFIG:=CONFIG_SND_SOC_SPDIF diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index a2dc9b90b1fc..324401244155 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -5649,6 +5649,7 @@ CONFIG_SND_PROC_FS=y # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_RENOIR is not set +# CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_AU1XAUDIO is not set # CONFIG_SND_SOC_AU1XPSC is not set # CONFIG_SND_SOC_BD28623 is not set @@ -5786,6 +5787,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set # CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SC7180 is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set @@ -5795,6 +5797,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STORM is not set # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_STI_SAS is not set diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index df9755b19e68..5ccc1dc41594 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -5940,6 +5940,7 @@ CONFIG_SND_PROC_FS=y # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP5x is not set # CONFIG_SND_SOC_AMD_RENOIR is not set +# CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_AU1XAUDIO is not set # CONFIG_SND_SOC_AU1XPSC is not set # CONFIG_SND_SOC_BD28623 is not set @@ -6097,6 +6098,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_RT5640 is not set # CONFIG_SND_SOC_RT5659 is not set # CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SC7180 is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set # CONFIG_SND_SOC_SIMPLE_MUX is not set @@ -6111,6 +6113,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_STORM is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS2562 is not set # CONFIG_SND_SOC_TAS2764 is not set From patchwork Mon Jan 2 23:25:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720845 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=38TY/iPU; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ixIvcMPY; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmBwn6djNz23f3 for ; Tue, 3 Jan 2023 10:32:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oKDvB8ZvFr5teMP8tPnlwZrqdlC1fbQqmIYW7Npx89s=; b=38TY/iPUKpTWN3 aOSdG8+jX8oZkCtGg5kOwjkbgREWrExAhLZnosY4YHQkVkvyjKwDYELcnvnvaTG0YnbwPnJweS3qd buMXCO/Sun4reOoI0LcisssexXRe7YiZTQ4Am/HIqFwNMqQ50dFPLpm71uSbh1U8RynsgFbEhY5yO HLw+sD7nXPURGveZ6AH1BgL74duk0ahsya5SwOjsfPsNUdw5S9hKhj0ppqU23GVn2d+l+8yfJoicr LYU1LogriJXqMJ/rTCexHSksL7Os8Rbfxl874j/9V6XOgMrxkloDJt6GiBxI1IZiiDi1NouxaSupt Ig5mo1aT77q5fBid/JzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUEt-00Erfv-3T; Mon, 02 Jan 2023 23:29:07 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBk-00Eqsh-7i for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:54 +0000 Received: by mail-pl1-x62d.google.com with SMTP id n4so30897518plp.1 for ; Mon, 02 Jan 2023 15:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FxT4ZZ6D0IEdo6Atb7324pKyhCOOHdbMAb1je57fBOI=; b=ixIvcMPYtEBHdElni80It9TgAYSmuh4afEyRWsmCeXOHMUN+wPZgBQKAr/EvD3w3rI y3HvJpbJ/EZK43ETTwpnygbZO/HQ30/tWrS9KNJNwVrFVxfLinsdvsB9VopIDDKFGN30 uEa1rrTFwbnlsyAZXgNGQ28bQ9YOJJkActjq4Hq7CRymuwd2MIbOVXMZz65FtNGxuC9i BFvEbX4ZweWUwyF7e6N8HJ70pGHEM8QrkRgvozEdJHewddT74NixV/zDdfwN9ukFxbSb 2QZEtGrTAiFfIMMTxoO42MMCIckCBEpYbYyvco4YQQP4b3a4NAQ5XQLYf/ytAlZcWG3D SEaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FxT4ZZ6D0IEdo6Atb7324pKyhCOOHdbMAb1je57fBOI=; b=uXbAS2+e8rFmhunmRr3uzxvgByfyW/sWCKwe/L2dDBqo0u6eYFs7Ad+rb7QNH5UEUc du23rpgtx1oylR6cgFhhw6azE97LLz/98vLDFyy1gI8lI6krHpVyfOBPaBR3RUpBQn09 5rDIBz1bdc2wGRtQoIptSJbB2MTapnu9+hu95WJFDtroPqvyig0Bk7HW7kNloIZjFLbJ WLkgom/fX4MmniZQtLgWuEB9HMpQNWVq+H/qSr9GhyAHgFSX+PVMq2AphBuZY/XKjppb 3M5K7sk5iRTHt/8acnRoFW+sNyGt2vxToKO9ZLGLhUkYauAXIi33iC0FtrfbWXV9t6qz K7MA== X-Gm-Message-State: AFqh2koNeXTi0PZUX3w1FAC6xJadkfxcZitnb1IwFiacd4qxm+UE7N/2 Qub5vU2EUfoD/iLhVqCU/5K/N21SS7s= X-Google-Smtp-Source: AMrXdXuhmCnr/FGyKKPT/MRg0dqBl38be688GqEc3y+UX9aJTJA8RV4fiFH+JrwEgm+m9DAy1hJuPw== X-Received: by 2002:a17:902:ab8f:b0:192:ce7c:dc43 with SMTP id f15-20020a170902ab8f00b00192ce7cdc43mr4091247plr.40.1672701951486; Mon, 02 Jan 2023 15:25:51 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id w3-20020a170902e88300b0018f69009f3esm4048183plg.284.2023.01.02.15.25.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:51 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 7/8] ath10k-ct: Support qcom,ath10k-calibration-data-base64 Date: Mon, 2 Jan 2023 15:25:33 -0800 Message-Id: <20230102232534.592501-7-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152552_379228_C2338784 X-CRM114-Status: GOOD ( 28.21 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: See the patch notes about the stock firmware for TP-Link Onhub and https://chromium-review.googlesource.com/243115. As noted there, the production firmware for Google OnHub devices only provide the *-base64 Device Tree property, and so either the kernel or some user space mechanism needs to know how to parse/conver [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 See the patch notes about the stock firmware for TP-Link Onhub and https://chromium-review.googlesource.com/243115. As noted there, the production firmware for Google OnHub devices only provide the *-base64 Device Tree property, and so either the kernel or some user space mechanism needs to know how to parse/convert this property. I haven't submitted this patch upstream. However, it applies relatively cleanly to the tree even after almost 8 years, so it doesn't seem too hard to maintain. Signed-off-by: Brian Norris --- .../970-ath10k-calibration-base64.patch | 249 ++++++++++++++++++ 1 file changed, 249 insertions(+) create mode 100644 package/kernel/ath10k-ct/patches/970-ath10k-calibration-base64.patch diff --git a/package/kernel/ath10k-ct/patches/970-ath10k-calibration-base64.patch b/package/kernel/ath10k-ct/patches/970-ath10k-calibration-base64.patch new file mode 100644 index 000000000000..739bdee9ccf4 --- /dev/null +++ b/package/kernel/ath10k-ct/patches/970-ath10k-calibration-base64.patch @@ -0,0 +1,249 @@ +Adapted from: +https://chromium-review.googlesource.com/307062 + +This "hack" remained in the production kernel, and so the production firmware +for Google OnHub still only knows how to patch the *-base64 Device Tree +property. + +CHROMIUM: HACK: ath10k: read calibration data in base64 format from DT + + Chrome OS firmware doesn't support binary format in VPD currently. + As a workaround, the firmware stores the calibration data in base64 + format in the same node with the different name: + + qcom,ath10k-calibration-data-base64 = [ 01 02 03 ... ]; + + Since the original property "qcom,ath10k-calibration-data" is always + looked for first, it should have an invalid size (e.g. 1). + + BUG=chrome-os-partner:35262 + TEST=build/boot on storm suceeded. Setup Storm board as AP using + hostapd and + connected to the board using another device. Device was able to + connect to + the internet and load multiple websites. + + Change-Id: I95675a803fad3b94977ecd0977bd9980779ad7e9 + Signed-off-by: Toshi Kikuchi + Reviewed-on: https://chromium-review.googlesource.com/243115 + Reviewed-by: Grant Grundler + +Change-Id: I17874f0ed03e28d279b08fe70aca70af57c90bda +Signed-off-by: Anilkumar Kolli +Reviewed-on: https://chromium-review.googlesource.com/307062 +Commit-Ready: Grant Grundler +Tested-by: Grant Grundler +Reviewed-by: Srinivasa duvvuri +Reviewed-by: Grant Grundler +--- a/ath10k-5.15/Makefile ++++ b/ath10k-5.15/Makefile +@@ -4,6 +4,7 @@ ath10k_core-y += mac.o \ + debug.o \ + core.o \ + coredump.o \ ++ decode64.o \ + htc.o \ + htt.o \ + htt_rx.o \ +--- a/ath10k-5.15/core.c ++++ b/ath10k-5.15/core.c +@@ -18,6 +18,7 @@ + #include + + #include "core.h" ++#include "decode64.h" + #include "mac.h" + #include "htc.h" + #include "hif.h" +@@ -2167,6 +2168,73 @@ static int ath10k_download_cal_file(stru + return 0; + } + ++static int ath10k_download_cal_dt_base64(struct ath10k *ar) ++{ ++ struct device_node *node; ++ int data_len; ++ void *data; ++ int ret; ++ ++ node = ar->dev->of_node; ++ if (!node) ++ /* Device Tree is optional, don't print any warnings if ++ * there's no node for ath10k. ++ */ ++ return -ENOENT; ++ ++ if (!of_get_property(node, "qcom,ath10k-calibration-data-base64", ++ &data_len)) { ++ /* The calibration data node is optional */ ++ return -ENOENT; ++ } ++ ++ data = kmalloc(data_len, GFP_KERNEL); ++ if (!data) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ ++ ret = of_property_read_u8_array(node, ++ "qcom,ath10k-calibration-data-base64", ++ data, data_len); ++ if (ret) { ++ ath10k_warn(ar, ++ "failed to read calibration data (base64) from DT: %d\n", ++ ret); ++ goto out_free; ++ } ++ ++ data_len = strip_nl(data, data + data_len, data); ++ data_len = decode64(data, data + data_len, data); ++ if (data_len < 0) { ++ ath10k_warn(ar, ++ "base64 decoder found invalid input\n"); ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ if (data_len != ar->hw_params.cal_data_len) { ++ ath10k_warn(ar, "invalid calibration data length in DT: %d\n", ++ data_len); ++ ret = -EMSGSIZE; ++ goto out_free; ++ } ++ ++ ret = ath10k_download_board_data(ar, data, data_len); ++ if (ret) { ++ ath10k_warn(ar, "failed to download base64 calibration data from Device Tree: %d\n", ++ ret); ++ goto out_free; ++ } ++ ++ ret = 0; ++out_free: ++ kfree(data); ++ ++out: ++ return ret; ++} ++ + static int ath10k_download_cal_dt(struct ath10k *ar, const char *dt_name) + { + struct device_node *node; +@@ -2787,6 +2855,12 @@ static int ath10k_download_cal_data(stru + "boot did not find target EEPROM entry, try OTP next: %d\n", + ret); + ++ ret = ath10k_download_cal_dt_base64(ar); ++ if (ret == 0) { ++ ar->cal_mode = ATH10K_CAL_MODE_DT; ++ goto done; ++ } ++ + ret = ath10k_download_and_run_otp(ar); + if (ret) { + ath10k_err(ar, "failed to run otp: %d (download-cal-data)\n", ret); +--- /dev/null ++++ b/ath10k-5.15/decode64.c +@@ -0,0 +1,89 @@ ++/* ++ * Copyright (c) 2013 The Linux Foundation. All rights reserved. ++ * Copyright (c) 2014, The Chromium OS Authors ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include "decode64.h" ++ ++static char revkey[128] = { ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, ++ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, ++ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, ++ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, ++ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, ++ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, ++}; ++ ++int ++decode64(unsigned char *src, unsigned char *src_end, unsigned char *dst) ++{ ++ unsigned char *dst_end = dst; ++ ++ while (&src[3] < src_end) { ++ int x; ++ int t[4]; ++ int i; ++ ++ if (src[0] == '=' || src[1] == '=' || ++ (src[2] == '=' && src[3] != '=')) { ++ return -1; ++ } ++ ++ for (i = 0; i < 4; i++) { ++ if (src[i] == '=') { ++ t[i] = 0; ++ } else { ++ if (src[i] >= 128 || ++ ((t[i] = revkey[src[i]]) < 0)) { ++ return -1; ++ } ++ } ++ } ++ ++ x = (t[0] << 18) + (t[1] << 12) + (t[2] << 6) + t[3]; ++ ++ *dst_end++ = (x >> 16) & 0xff; ++ if (src[2] != '=') ++ *dst_end++ = (x >> 8) & 0xff; ++ if (src[3] != '=') ++ *dst_end++ = x & 0xff; ++ ++ src += 4; ++ } ++ ++ if (src != src_end) ++ return -1; ++ ++ return dst_end - dst; ++} ++ ++int ++strip_nl(unsigned char *src, unsigned char *src_end, unsigned char *dst) ++{ ++ unsigned char *dst_end = dst; ++ ++ while (src < src_end) { ++ if (*src != '\n') ++ *dst_end++ = *src; ++ src++; ++ } ++ ++ return dst_end - dst; ++} +--- /dev/null ++++ b/ath10k-5.15/decode64.h +@@ -0,0 +1,10 @@ ++#ifndef _DECODE64_H_ ++#define _DECODE64_H_ ++ ++int decode64(unsigned char *src, unsigned char *src_end, ++ unsigned char *dst); ++ ++int strip_nl(unsigned char *src, unsigned char *src_end, ++ unsigned char *dst); ++ ++#endif /* _DECODE64_H_ */ From patchwork Mon Jan 2 23:25:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1720850 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=icF19Gnq; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=YcN49mLB; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NmC8P37wNz23f3 for ; Tue, 3 Jan 2023 10:42:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WN8GhtAszUHAohHR7HA3LU2zIw+ur7c9Zd8b7Gvyke8=; b=icF19Gnqk+1124 BAi+Df/+CN87ye0P62RRGVTPi0wC1DQUcq8eB5xMwHX38W8K/szY5U3uHh3DS3Nhybx05KkZzNAWo vSzgcInkT4KzpyVFAH1Z/sqqa1jsemKENl4TyHYy5yMQgyIyqYP0EezxCsAlq60QU8w4GIZl4H6LF YS7bp5ISzyr7XuyUX6U7yx5VwsMoYbMZ37JPFcgReonsJP5uv3hHh7qJlAD2iPWciilBGtA9TrxOW e0nWzH9Kdws3ZSbyHrd3Dbtlzok0cvEEc7V801b0p4SD0CCtYA0Xo5Y133iGZ/5+mixccmZqGgiXO VdT6o2tV75rl1GsI7kXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUOO-00Ew97-7J; Mon, 02 Jan 2023 23:38:57 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCUBn-00Equa-LE for openwrt-devel@lists.openwrt.org; Mon, 02 Jan 2023 23:25:59 +0000 Received: by mail-pg1-x534.google.com with SMTP id q9so2104906pgq.5 for ; Mon, 02 Jan 2023 15:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B3p5oQYISWBT9sPFqhzoVa/Ee8TkDWe8i6MDNtn8avU=; b=YcN49mLBYbcIOlhI3Nvy9g4NVCLqXGAEwlB8+OtD5IH1dNelhQteNP0SOrsISfppzP /hUVHRRPWhwYpU0IJQ6mvqAbBEG3hqmyFqrT76F5KQT0IlEVPP6J9P7OZvRMxm6HyvfL IokAhmnX0R+UMnlzOmjHVwbZnZH6s+5vmu/MiECO89QztY3maNfrglsFcT1y6OWbaA3O 9qHutShUIbYO9GYfqPcaYp9HGCtSENIsH/qOTRA+vmdB8+ryYWBAe0rECZsF2PMotlgp gwt8KKyPPVUtj8H1j/ARJMONgirnquURjjW4IyScrq9fk6qm+uHIjXym+c+7hL5ZssBb Jt1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B3p5oQYISWBT9sPFqhzoVa/Ee8TkDWe8i6MDNtn8avU=; b=OHzKDdQ7aN3WpuotRUC2DP2rPqug33tAvpKJTuaJ/pQrbbhYAH8LpeiZqSuqCdzwTW +MK+lrN30WENQleOH9cTPKtlvm8n7RsYpHDfRpWbBQ9goxBBLmYjH2pWMO/VGG14Yx3h 4EG4IPSiNwBV4IrNUlN0Mkx7cuhvMOg/IsAR+xRdtBe3oMQ3OccAmkczphAiYWORxijl mt1Qim0wl32olhWVhJDARdfckBxVLipbaoUHiX+YYxf8JtDB914z12ueY79DMtBAxnry yr+eQmV+vLNeDVYxD0GFlL7LQ+XQ5AhvbzpbniH3mw6KF/uuUGcM9XbiAQh5tJW4TymI nXIw== X-Gm-Message-State: AFqh2kqIc3nG4urXqEYo14lpOBNbInvZlSOPWdvtaszeWD0PaKZq336r drOiE+PWG4mCMRVyuNwZkGGbk3PXGdw= X-Google-Smtp-Source: AMrXdXtQt5fD3h3sUI7AZdYxLJn57YxSG7cyx07hf6vwaaL1IXuaOkOMCE0rOAafLy08+rMW9sD8Lg== X-Received: by 2002:a05:6a00:a07:b0:580:9431:1b1a with SMTP id p7-20020a056a000a0700b0058094311b1amr50111413pfh.5.1672701953079; Mon, 02 Jan 2023 15:25:53 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id i2-20020aa796e2000000b00581172f7456sm14478682pfq.56.2023.01.02.15.25.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 15:25:52 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris Subject: [PATCH 8/8] ipq806x: Initial TP-Link and ASUS OnHub support Date: Mon, 2 Jan 2023 15:25:34 -0800 Message-Id: <20230102232534.592501-8-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102232534.592501-1-computersforpeace@gmail.com> References: <20230102232534.592501-1-computersforpeace@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230102_152555_773618_8457826B X-CRM114-Status: GOOD ( 25.80 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: TP-Link and ASUS OnHub devices are very similar, sharing many of the same characteristics and much of their Device Tree. They both run a version of ChromeOS for their factory firmware, and so installa [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:534 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 TP-Link and ASUS OnHub devices are very similar, sharing many of the same characteristics and much of their Device Tree. They both run a version of ChromeOS for their factory firmware, and so installation instructions look very similar to Google Wifi [1]. Things that work: * Ethernet * WiFi (2.4 and 5 GHz) * LEDs * USB * eMMC * Serial console (if you wire it up yourself) * 1 CPU * Speaker; I think I've worked out the kinks (with the parent patches, and tweaking pin configuration a bit) Things that don't work: * The second CPU; bringing up the second CPU seems to hang right now, so I disable it with "maxcpus=1". == Installation instructions summary == 1. Flash *-factory.bin to a USB drive (e.g., with `dd`) 2. Enter Developer Mode 3. Insert USB drive, to boot OpenWrt from USB 4. Copy the same *-factory.bin over to device, and flash it to eMMC to make OpenWrt permanent == Developer mode (Step 2) == To enter Developer Mode [2], follow these steps: 1. Unplug power 2. Gain access to the "developer switch" through the bottom of the device 3. Plug a USB keyboard into the device's USB port 4. Hold down the "reset switch" (near the USB port / power plug) 5. Plug power back in 6. The LED on the device should turn white, then blink orange, then red. Release the reset switch. 7. Press CTRL+D on the keyboard. The LED should now start blinking purple. 8. Press and release the hidden "developer switch" under the device. 9. The device should reboot, and start blinking purple again. You have successfully entered developer mode. 10. Unplug power These instructions are derived from: https://www.exploitee.rs/index.php/Rooting_The_Google_OnHub#Enabling_%22Developer_Mode%22_on_the_OnHub https://www.exploitee.rs/index.php/Asus_OnHub#Enabling_%22Developer_Mode%22_on_the_OnHub ~~Finding the developer switch:~~ for TP-Link, the developer switch is on the bottom of the device, underneath some of the rubber padding and a screw. For ASUS, remove the entire base, via 4 screws under the rubber feet. See the Exploitee instructions for more info and photos. == Booting from USB (Step 3) == After entering developer mode: 1. Unplug power 2. Insert USB drive with OpenWrt factory.bin 3. Plug power; after a few seconds, the device should start blinking purple 4. Press the hidden developer switch under the device to boot to USB; you should see some activity lights (if you have any) on your USB drive 5. Depending on your configuration, the router's LED(s) should come on. You're now running OpenWrt off a USB stick. == Making OpenWrt permanent (on eMMC) (Step 4) == Once you're running OpenWrt via USB: 1. Connect Ethernet to the LAN port; router's LAN address should be at 192.168.1.1 2. Connect another system to the router's LAN, and copy the factory.bin image over, via SCP and SSH: scp -O openwrt-ipq806x-chromium-tplink_onhub-squashfs-factory.bin root@192.168.1.1: ssh root@192.168.1.1 -C "dd if=/dev/zero bs=512 seek=7552991 of=/dev/mmcblk0 count=33 && \ dd if=/root/openwrt-ipq806x-chromium-tplink_onhub-squashfs-factory.bin of=/dev/mmcblk0" 3. Reboot and remove the USB drive. == Developer mode beep == Note that every time you boot the OnHub in developer mode, the device will play a loud "beep" after a few seconds. This is described in the Chromium docs [2], and is intended to make it clear that the device is not running Google software. It is nontrivial to completely disable this beep, although it's possible to "acknowledge" developer mode (and skip the beep) by using a USB keyboard to press CTRL+D every time you boot. [1] https://openwrt.org/toh/google/wifi [2] https://chromium.googlesource.com/chromiumos/docs/+/HEAD/developer_mode.md Signed-off-by: Brian Norris --- * We could perhaps factor out some of the cros-vboot stuff that's shared with google,wifi into a common location? * There might be better ways to handle the multi-color LED support, but for now, each color is a separate LED * A variety of people have been interested in this work, and a few have tested versions of it already: https://forum.openwrt.org/t/onhub-tp-link-tgr1900-future-support/17899 target/linux/ipq806x/Makefile | 4 +- .../ipq806x/base-files/etc/board.d/01_leds | 11 + .../ipq806x/base-files/etc/board.d/02_network | 6 + .../base-files/lib/upgrade/platform.sh | 18 + target/linux/ipq806x/chromium/config-default | 13 + target/linux/ipq806x/chromium/target.mk | 2 + .../arm/boot/dts/qcom-ipq8064-asus-onhub.dts | 95 ++++ .../arch/arm/boot/dts/qcom-ipq8064-onhub.dtsi | 466 ++++++++++++++++++ .../boot/dts/qcom-ipq8064-tplink-onhub.dts | 207 ++++++++ target/linux/ipq806x/generic/target.mk | 1 + target/linux/ipq806x/image/Makefile | 1 + target/linux/ipq806x/image/chromium.mk | 55 +++ 12 files changed, 877 insertions(+), 2 deletions(-) create mode 100644 target/linux/ipq806x/chromium/config-default create mode 100644 target/linux/ipq806x/chromium/target.mk create mode 100644 target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts create mode 100644 target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-onhub.dtsi create mode 100644 target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts create mode 100644 target/linux/ipq806x/image/chromium.mk diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 862ad7da004b..5c89d413c0d3 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=ipq806x BOARDNAME:=Qualcomm Atheros IPQ806X -FEATURES:=squashfs nand fpu ramdisk +FEATURES:=squashfs fpu ramdisk CPU_TYPE:=cortex-a15 CPU_SUBTYPE:=neon-vfpv4 -SUBTARGETS:=generic +SUBTARGETS:=generic chromium KERNEL_PATCHVER:=5.15 diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds index 2b259b903614..80a337c6a4d4 100644 --- a/target/linux/ipq806x/base-files/etc/board.d/01_leds +++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds @@ -9,6 +9,9 @@ board_config_update board=$(board_name) case "$board" in +asus,onhub) + ucidef_set_led_default "status" "STATUS" "LED_Green" "1" + ;; buffalo,wxr-2533dhp) ucidef_set_led_wlan "wlan" "WLAN" "white:wireless" "phy0tpt" ucidef_set_led_switch "wan" "WAN" "white:internet" "switch0" "0x20" @@ -58,6 +61,14 @@ tplink,c2600) ucidef_set_led_switch "wan" "wan" "white:wan" "switch0" "0x20" ucidef_set_led_switch "lan" "lan" "white:lan" "switch0" "0x1e" ;; +tplink,onhub) + ucidef_set_led_default "led0_red" "LED0_Red" "LED0_Red" "1" + ucidef_set_led_default "led1_green" "LED1_Green" "LED1_Green" "1" + ucidef_set_led_default "led2_blue" "LED2_Blue" "LED2_Blue" "1" + ucidef_set_led_default "led3_red" "LED3_Red" "LED3_Red" "1" + ucidef_set_led_default "led4_green" "LED4_Green" "LED4_Green" "1" + ucidef_set_led_default "led5_blue" "LED5_Blue" "LED5_Blue" "1" + ;; tplink,vr2600v) ucidef_set_led_usbport "usb" "USB" "white:usb" "usb1-port1" "usb2-port1" "usb3-port1" "usb4-port1" ucidef_set_led_switch "lan" "lan" "white:lan" "switch0" "0x1e" diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network index dbff854731a4..f38876b69f08 100644 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network @@ -79,6 +79,12 @@ tplink,ad7200) ucidef_add_switch "switch0" \ "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6@eth1" "1:wan" "0@eth0" ;; +asus,onhub |\ +tplink,onhub) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ucidef_add_switch "switch0" \ + "1:lan" "6@eth1" "2:wan" "0@eth0" + ;; ubnt,unifi-ac-hd) ucidef_set_interface_lan "eth0 eth1" ;; diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh index f9e592f4bd8f..ada895319b65 100644 --- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh @@ -57,6 +57,14 @@ platform_do_upgrade() { MTD_CONFIG_ARGS="-s 0x200000" default_do_upgrade "$1" ;; + asus,onhub |\ + tplink,onhub) + export_bootdevice + export_partdevice CI_ROOTDEV 0 + CI_KERNPART="kernel" + CI_ROOTPART="rootfs" + emmc_do_upgrade "$1" + ;; tplink,vr2600v) MTD_CONFIG_ARGS="-s 0x200000" default_do_upgrade "$1" @@ -69,3 +77,13 @@ platform_do_upgrade() { ;; esac } + +platform_copy_config() { + case "${board_name}" in + asus,onhub |\ + tplink,onhub) + emmc_copy_config + ;; + esac + return 0 +} diff --git a/target/linux/ipq806x/chromium/config-default b/target/linux/ipq806x/chromium/config-default new file mode 100644 index 000000000000..d7db9f7db35a --- /dev/null +++ b/target/linux/ipq806x/chromium/config-default @@ -0,0 +1,13 @@ +CONFIG_BLK_DEV_SD=y +CONFIG_LEDS_LP5523=y +CONFIG_LEDS_LP55XX_COMMON=y +CONFIG_PHY_QCOM_IPQ806X_USB=y +CONFIG_SCSI=y +CONFIG_SCSI_COMMON=y +CONFIG_SG_POOL=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_HOST=y +CONFIG_USB_DWC3_QCOM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y diff --git a/target/linux/ipq806x/chromium/target.mk b/target/linux/ipq806x/chromium/target.mk new file mode 100644 index 000000000000..3983a9281a5d --- /dev/null +++ b/target/linux/ipq806x/chromium/target.mk @@ -0,0 +1,2 @@ +BOARDNAME:=Google Chromium +FEATURES += emmc boot-part rootfs-part diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts new file mode 100644 index 000000000000..7ce41bc92b80 --- /dev/null +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2014 The ChromiumOS Authors + */ + +#include "qcom-ipq8064-onhub.dtsi" +#include +#include +#include + +/ { + model = "ASUS OnHub"; + compatible = "asus,onhub", "google,arkham", "qcom,ipq8064"; + + chosen { + bootargs-append = " maxcpus=1 rootwait"; + }; +}; + +&qcom_pinmux { + ap3223_pins: ap3223_pinmux { + pins = "gpio22"; + function = "gpio"; + bias-none; + }; + + i2c7_pins: i2c7_pinmux { + mux { + pins = "gpio8", "gpio9"; + function = "gsbi7"; + }; + data { + pins = "gpio8"; + bias-disable; + }; + clk { + pins = "gpio9"; + bias-disable; + }; + }; +}; + +&gsbi7 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi7_i2c { + status = "okay"; + clock-frequency = <100000>; + pinctrl-0 = <&i2c7_pins>; + pinctrl-names = "default"; + + ap3223@1c { + compatible = "dynaimage,ap3223"; + reg = <0x1c>; + + pinctrl-0 = <&ap3223_pins>; + pinctrl-names = "default"; + + int-gpio = <&qcom_pinmux 22 GPIO_ACTIVE_LOW>; + }; + + led-controller@32 { + compatible = "national,lp5523"; + reg = <0x32>; + clock-mode = /bits/ 8 <1>; + #address-cells = <1>; + #size-cells = <0>; + + led@4 { + reg = <4>; + color = ; + chan-name = "LED_Green"; + led-cur = /bits/ 8 <0xfa>; + max-cur = /bits/ 8 <0xff>; + }; + + led@5 { + reg = <5>; + color = ; + chan-name = "LED_Blue"; + led-cur = /bits/ 8 <0xfa>; + max-cur = /bits/ 8 <0xff>; + }; + + led@8 { + reg = <8>; + color = ; + chan-name = "LED_Red"; + led-cur = /bits/ 8 <0xfa>; + max-cur = /bits/ 8 <0xff>; + }; + }; +}; diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-onhub.dtsi b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-onhub.dtsi new file mode 100644 index 000000000000..7b56e6ff4f5a --- /dev/null +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-onhub.dtsi @@ -0,0 +1,466 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2014 The ChromiumOS Authors + */ + +#include "qcom-ipq8064-smb208.dtsi" +#include +#include + +/ { + aliases { + ethernet0 = &gmac0; + ethernet1 = &gmac2; + mdio-gpio0 = &mdio; + serial0 = &gsbi4_serial; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + rsvd@41200000 { + reg = <0x41200000 0x300000>; + no-map; + }; + }; + + mdio: mdio { + compatible = "virtual,mdio-gpio"; + #address-cells = <1>; + #size-cells = <0>; + gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>, + <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + + phy0: ethernet-phy@0 { + reg = <0>; + qca,ar8327-initvals = < + 0x00004 0x7600000 /* PAD0_MODE */ + 0x00008 0x1000000 /* PAD5_MODE */ + 0x0000c 0x80 /* PAD6_MODE */ + 0x000e4 0xaa545 /* MAC_POWER_SEL */ + 0x000e0 0xc74164de /* SGMII_CTRL */ + 0x0007c 0x4e /* PORT0_STATUS */ + 0x00094 0x4e /* PORT6_STATUS */ + >; + }; + + phy1: ethernet-phy@1 { + reg = <1>; + }; + }; + + soc { + rng@1a500000 { + status = "disabled"; + }; + + sound { + compatible = "google,storm-audio"; + qcom,model = "ipq806x-storm"; + cpu = <&lpass>; + codec = <&max98357a>; + }; + + lpass: lpass@28100000 { + status = "okay"; + pinctrl-names = "default", "idle"; + pinctrl-0 = <&mi2s_default>; + pinctrl-1 = <&mi2s_idle>; + }; + + max98357a: max98357a { + compatible = "maxim,max98357a"; + #sound-dai-cells = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmode_pins>; + sdmode-gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&qcom_pinmux { + rgmii0_pins: rgmii0_pins { + mux { + pins = "gpio2", "gpio66"; + drive-strength = <8>; + bias-disable; + }; + }; + mi2s_pins { + mi2s_default: mi2s_default { + dout { + pins = "gpio32"; + function = "mi2s"; + drive-strength = <16>; + bias-disable; + }; + sync { + pins = "gpio27"; + function = "mi2s"; + drive-strength = <16>; + bias-disable; + }; + clk { + pins = "gpio28"; + function = "mi2s"; + drive-strength = <16>; + bias-disable; + }; + }; + mi2s_idle: mi2s_idle { + dout { + pins = "gpio32"; + function = "mi2s"; + drive-strength = <2>; + bias-pull-down; + }; + sync { + pins = "gpio27"; + function = "mi2s"; + drive-strength = <2>; + bias-pull-down; + }; + clk { + pins = "gpio28"; + function = "mi2s"; + drive-strength = <2>; + bias-pull-down; + }; + }; + }; + + mdio_pins: mdio_pins { + mux { + pins = "gpio0", "gpio1"; + function = "gpio"; + drive-strength = <8>; + bias-disable; + }; + rst { + pins = "gpio26"; + output-low; + }; + }; + + sdmode_pins: sdmode_pinmux { + pins = "gpio25"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + + sdcc1_pins: sdcc1_pinmux { + mux { + pins = "gpio38", "gpio39", "gpio40", + "gpio41", "gpio42", "gpio43", + "gpio44", "gpio45", "gpio46", + "gpio47"; + function = "sdc1"; + }; + cmd { + pins = "gpio45"; + drive-strength = <10>; + bias-pull-up; + }; + data { + pins = "gpio38", "gpio39", "gpio40", + "gpio41", "gpio43", "gpio44", + "gpio46", "gpio47"; + drive-strength = <10>; + bias-pull-up; + }; + clk { + pins = "gpio42"; + drive-strength = <16>; + bias-pull-down; + }; + }; + + i2c1_pins: i2c1_pinmux { + pins = "gpio53", "gpio54"; + function = "gsbi1"; + bias-disable; + }; + + rpm_i2c_pinmux: rpm_i2c_pinmux { + mux { + pins = "gpio12", "gpio13"; + function = "gsbi4"; + drive-strength = <12>; + bias-disable; + }; + }; + + spi_pins: spi_pins { + mux { + pins = "gpio18", "gpio19", "gpio21"; + function = "gsbi5"; + bias-pull-down; + /delete-property/ bias-none; + /delete-property/ drive-strength; + }; + data { + pins = "gpio18", "gpio19"; + drive-strength = <10>; + }; + cs { + pins = "gpio20"; + drive-strength = <10>; + bias-pull-up; + }; + clk { + pins = "gpio21"; + drive-strength = <12>; + }; + }; + + fw_pinmux { + wp { + pins = "gpio17"; + output-low; + }; + recovery { + pins = "gpio16"; + bias-none; + }; + developer { + pins = "gpio15"; + bias-none; + }; + }; + + spi6_pins: spi6_pins { + mux { + pins = "gpio55", "gpio56", "gpio58"; + function = "gsbi6"; + bias-pull-down; + }; + data { + pins = "gpio55", "gpio56"; + drive-strength = <10>; + }; + cs { + pins = "gpio57"; + drive-strength = <10>; + bias-pull-up; + output-high; + }; + clk { + pins = "gpio58"; + drive-strength = <12>; + }; + }; +}; + +&gmac0 { + status = "okay"; + phy-mode = "rgmii"; + qcom,id = <0>; + phy-handle = <&phy1>; + + pinctrl-0 = <&rgmii0_pins>; + pinctrl-names = "default"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gmac2 { + status = "okay"; + phy-mode = "sgmii"; + qcom,id = <2>; + phy-handle = <&phy0>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&gsbi1 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi1_i2c { + status = "okay"; + + clock-frequency = <100000>; + + pinctrl-0 = <&i2c1_pins>; + pinctrl-names = "default"; + + tpm@20 { + compatible = "infineon,slb9645tt"; + reg = <0x20>; + powered-while-suspended; + }; +}; + +&gsbi4 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi4_serial { + status = "okay"; +}; + +&gsbi5 { + status = "okay"; + qcom,mode = ; + + spi4: spi@1a280000 { + status = "okay"; + spi-max-frequency = <50000000>; + pinctrl-0 = <&spi_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 20 0>; + + flash: flash@0 { + compatible = "jedec,spi-nor"; + spi-max-frequency = <50000000>; + reg = <0>; + }; + }; +}; + +&gsbi6 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi6_spi { + status = "okay"; + spi-max-frequency = <25000000>; + + pinctrl-0 = <&spi6_pins>; + pinctrl-names = "default"; + + cs-gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>; + + dmas = <&adm_dma 8 0xb>, + <&adm_dma 7 0x14>; + dma-names = "rx", "tx"; + + /* + * This "spidev" was included in the manufacturer device tree. I suspect + * it's the (unused) Zigbee radio -- SiliconLabs EM3581 Zigbee? There's + * no driver or binding for this at the moment. + */ + spidev@0 { + compatible = "spidev"; + reg = <0>; + spi-max-frequency = <25000000>; + }; +}; + +&pcie0 { + status = "okay"; + + pcie@0 { + reg = <0 0 0 0 0>; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + + ath10k@0,0 { + reg = <0 0 0 0 0>; + device_type = "pci"; + qcom,ath10k-calibration-data = [00]; + qcom,ath10k-sa-gpio = <2 3 4 0>; + qcom,ath10k-sa-gpio-func = <5 5 5 0>; + }; + }; +}; + +&pcie1 { + status = "okay"; + + pcie@0 { + reg = <0 0 0 0 0>; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + + ath10k@0,0 { + reg = <0 0 0 0 0>; + device_type = "pci"; + qcom,ath10k-calibration-data = [00]; + qcom,ath10k-sa-gpio = <2 3 4 0>; + qcom,ath10k-sa-gpio-func = <5 5 5 0>; + }; + }; +}; + +&pcie2 { + status = "okay"; + + pcie@0 { + reg = <0 0 0 0 0>; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + + ath10k@0,0 { + reg = <0 0 0 0 0>; + device_type = "pci"; + qcom,ath10k-calibration-data = [00]; + }; + }; +}; + +&rpm { + pinctrl-0 = <&rpm_i2c_pinmux>; + pinctrl-names = "default"; +}; + +&sdcc1 { + status = "okay"; + pinctrl-0 = <&sdcc1_pins>; + pinctrl-names = "default"; + /delete-property/ mmc-ddr-1_8v; +}; + +&tcsr { + compatible = "qcom,tcsr-ipq8064", "qcom,tcsr", "syscon"; + qcom,usb-ctrl-select = ; +}; + +&hs_phy_0 { + status = "okay"; +}; + +&ss_phy_0 { + status = "okay"; +}; + +&usb3_0 { + status = "okay"; +}; + +&hs_phy_1 { + status = "okay"; +}; + +&ss_phy_1 { + status = "okay"; +}; + +&usb3_1 { + status = "okay"; +}; diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts new file mode 100644 index 000000000000..112de6769f29 --- /dev/null +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts @@ -0,0 +1,207 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2014 The ChromiumOS Authors + */ + +#include "qcom-ipq8064-onhub.dtsi" +#include +#include +#include + +/ { + model = "TP-Link OnHub"; + compatible = "tplink,onhub", "google,whirlwind-sp5", "qcom,ipq8064"; + + chosen { + bootargs-append = " maxcpus=1 rootwait"; + }; +}; + +&qcom_pinmux { + i2c7_pins: i2c7_pinmux { + mux { + pins = "gpio8", "gpio9"; + function = "gsbi7"; + }; + data { + pins = "gpio8"; + bias-disable; + }; + clk { + pins = "gpio9"; + bias-disable; + }; + }; +}; + +&gsbi7 { + status = "okay"; + qcom,mode = ; +}; + +&gsbi7_i2c { + status = "okay"; + clock-frequency = <100000>; + pinctrl-0 = <&i2c7_pins>; + pinctrl-names = "default"; + + led-controller@32 { + compatible = "national,lp5523"; + reg = <0x32>; + clock-mode = /bits/ 8 <1>; + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = ; + chan-name = "LED0_Red"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@1 { + reg = <1>; + color = ; + chan-name = "LED0_Green"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@2 { + reg = <2>; + color = ; + chan-name = "LED0_Blue"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@3 { + reg = <3>; + color = ; + chan-name = "LED1_Red"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@4 { + reg = <4>; + color = ; + chan-name = "LED1_Green"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@5 { + reg = <5>; + color = ; + chan-name = "LED1_Blue"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@6 { + reg = <6>; + color = ; + chan-name = "LED2_Red"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@7 { + reg = <7>; + color = ; + chan-name = "LED2_Green"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@8 { + reg = <8>; + color = ; + chan-name = "LED2_Blue"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + }; + + led-controller@33 { + compatible = "national,lp5523"; + reg = <0x33>; + clock-mode = /bits/ 8 <1>; + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + color = ; + chan-name = "LED3_Red"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@1 { + reg = <1>; + color = ; + chan-name = "LED3_Green"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@2 { + reg = <2>; + color = ; + chan-name = "LED3_Blue"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@3 { + reg = <3>; + color = ; + chan-name = "LED4_Red"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@4 { + reg = <4>; + color = ; + chan-name = "LED4_Green"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@5 { + reg = <5>; + color = ; + chan-name = "LED4_Blue"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@6 { + reg = <6>; + color = ; + chan-name = "LED5_Red"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@7 { + reg = <7>; + color = ; + chan-name = "LED5_Green"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + + led@8 { + reg = <8>; + color = ; + chan-name = "LED5_Blue"; + led-cur = /bits/ 8 <0x64>; + max-cur = /bits/ 8 <0x78>; + }; + }; +}; diff --git a/target/linux/ipq806x/generic/target.mk b/target/linux/ipq806x/generic/target.mk index f5cb1fb19b94..4de636f0e0ae 100644 --- a/target/linux/ipq806x/generic/target.mk +++ b/target/linux/ipq806x/generic/target.mk @@ -1 +1,2 @@ BOARDNAME:=Generic +FEATURES += nand diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 8c1fc88010cd..c5c23eb9f72e 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -5,6 +5,7 @@ include $(INCLUDE_DIR)/image.mk define Device/Default PROFILES := Default + KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_LOADADDR = 0x42208000 DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) DEVICE_DTS_CONFIG := config@1 diff --git a/target/linux/ipq806x/image/chromium.mk b/target/linux/ipq806x/image/chromium.mk new file mode 100644 index 000000000000..a11faa38df88 --- /dev/null +++ b/target/linux/ipq806x/image/chromium.mk @@ -0,0 +1,55 @@ +define Build/cros-gpt + cp $@ $@.tmp 2>/dev/null || true + ptgen -o $@.tmp -g \ + -T cros_kernel -N kernel -p $(CONFIG_TARGET_KERNEL_PARTSIZE)m \ + -N rootfs -p $(CONFIG_TARGET_ROOTFS_PARTSIZE)m + cat $@.tmp >> $@ + rm $@.tmp +endef + +define Build/append-kernel-part + dd if=$(IMAGE_KERNEL) bs=$(CONFIG_TARGET_KERNEL_PARTSIZE)M conv=sync >> $@ +endef + +# NB: Chrome OS bootloaders replace the '%U' in command lines with the UUID of +# the kernel partition it chooses to boot from. This gives a flexible way to +# consistently build and sign kernels that always use the subsequent +# (PARTNROFF=1) partition as their rootfs. +define Build/cros-vboot + $(STAGING_DIR_HOST)/bin/cros-vbutil \ + -k $@ -c "root=PARTUUID=%U/PARTNROFF=1" -o $@.new + @mv $@.new $@ +endef + +define Device/OnhubImage + KERNEL_LOADADDR = 0x44208000 + SOC := qcom-ipq8064 + KERNEL_SUFFIX := -fit-zImage.itb.vboot + KERNEL_NAME := zImage + KERNEL = kernel-bin | fit none $$(KDIR)/image-$$(DEVICE_DTS).dtb | cros-vboot + IMAGES := factory.bin sysupgrade.bin + IMAGE/factory.bin := cros-gpt | append-kernel-part | append-rootfs + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + DEVICE_PACKAGES := ath10k-firmware-qca988x-ct e2fsprogs kmod-fs-ext4 losetup \ + partx-utils mkf2fs kmod-fs-f2fs \ + kmod-google-firmware kmod-tpm-i2c-infineon \ + kmod-sound-soc-ipq8064-storm kmod-usb-storage +endef + +define Device/asus_onhub + $(call Device/OnhubImage) + DEVICE_VENDOR := ASUS + DEVICE_MODEL := OnHub SRT-AC1900 + DEVICE_DTS := $$(SOC)-asus-onhub + BOARD_NAME := asus-onhub +endef +TARGET_DEVICES += asus_onhub + +define Device/tplink_onhub + $(call Device/OnhubImage) + DEVICE_VENDOR := TP-Link + DEVICE_MODEL := OnHub AC1900 Cloud Router + DEVICE_DTS := $$(SOC)-tplink-onhub + BOARD_NAME := tplink-onhub +endef +TARGET_DEVICES += tplink_onhub