From patchwork Mon Sep 11 21:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13380150 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92B9BCA0ECF for ; Mon, 11 Sep 2023 21:48:30 +0000 (UTC) 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=x1qy2+1T0+tydA2jRmXwUrZE2iheWqIP910eUxlaVO8=; b=DTXy3hVw7/tNrR /fQnd2hYK3JhoW/wXEjWvGJal6CsG4k5rod/lgbT4uWdAGJOLviDKs1EMCv0JTDALXKmT8V5dHkFy ZHwMf0d2vm7zszbvdyV+vwbk5bcMevNLawocj8m4HYgtFtM9uD+qWNPNB++wbqOnW5yb/97d347xX FRjvsz1SYVPu4jEg34X05+elL8yCqMSvWeI9K0C/X0vTLVSo45XzAqDLYuRMBAa6zL+fXr7iB933A rt2e3a7nlwRaeOl9a7qb3Yosvu5caBz9b/4f5GoV9sboR9rTtU703s4NtjMK1gxmsK1uhENTrafjS FdlfpqBBDvyVf98RjNJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfolE-001QdC-2i; Mon, 11 Sep 2023 21:48:00 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfolB-001Qbj-2m for linux-arm-kernel@lists.infradead.org; Mon, 11 Sep 2023 21:47:59 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7FCD7B8197B; Mon, 11 Sep 2023 21:47:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C90AC07616; Mon, 11 Sep 2023 21:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694468875; bh=V1/4qYoS5i83IaWV3Li0Ak1OZFvqoZ3kUw55Zk3yyRs=; h=From:To:Cc:Subject:Date:From; b=hz9D28Z37OI76V5gXXxgFSPt/cPlL5BKMffWrUkSyAR9wFdMONbOhKnVTBir4McnB 8qwlPlEvLh6STAshvvGAdqH+LXK4dyYCxplTiiheahGdDFDGXstRJp81UmdV98ebce nT2Awui41JA7Djts4w1Wp0aXtosj4VUA1UP8rmMV0QQ4DlFTwEkGcasM+8zEyIuZ6S q7FC5MFGlvU4J8ENT2t+IwegJgwXezjUcHyp9VMX6tqTQgS5z4k9TIe6dTWb0IPC9t kca7YFy7o6LMBKAEauRN289diUhH+9n8sQ4g2g3zZ2GxS4np8ErobGKoCooT8ylihm QT8wAkDaN9Urg== Received: (nullmailer pid 2203086 invoked by uid 1000); Mon, 11 Sep 2023 21:47:53 -0000 From: Rob Herring To: Krzysztof Kozlowski , Conor Dooley , Michal Simek Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: xilinx: Apply overlays to base dtbs Date: Mon, 11 Sep 2023 16:47:47 -0500 Message-Id: <20230911214751.2202913-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_144758_037275_DA3E5E58 X-CRM114-Status: GOOD ( 12.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time. Defining the "-dtbs" variable is not enough as the combined DT must be added to dtbs-y. zynqmp-sck-kr-g-revA.dtso and zynqmp-sck-kr-g-revB.dtso don't exist, so drop them. Signed-off-by: Rob Herring --- arch/arm64/boot/dts/xilinx/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile index 5e40c0b4fa0a..1068b0fa8e98 100644 --- a/arch/arm64/boot/dts/xilinx/Makefile +++ b/arch/arm64/boot/dts/xilinx/Makefile @@ -22,11 +22,10 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb zynqmp-sm-k26-revA-sck-kv-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revA.dtb zynqmp-sm-k26-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revB.dtb zynqmp-smk-k26-revA-sck-kv-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revA.dtb zynqmp-smk-k26-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo - -zynqmp-sm-k26-revA-sck-kr-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -zynqmp-sm-k26-revA-sck-kr-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo -zynqmp-smk-k26-revA-sck-kr-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -zynqmp-smk-k26-revA-sck-kr-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revB.dtb