From patchwork Mon Oct 24 17:34:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13017895 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 97AE2C38A2D for ; Mon, 24 Oct 2022 17:35:51 +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: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=GPOFniNsXhvY4ecLRf/gIEvQ4DxwRCiUuOcXPonvom4=; b=rI26EaVGogLPFn bAd+0RUX8q1ArOkEuBwpzxjN62rNs7NHxBklndYAgo36/8ljFj9j3wtXkdGzzCMa+sOvMVbsGSDf7 LB/NeoRpYYIxY8/5/swj1/Y7eOuVTdUwjFeF1vnQV/v8bF1lnMB7XXVP7UXq7zmSVwMDZRhtNIsCV B5bkv8G8THyYfRgWnzp0fTv5okZqaJRUwRCjktU40P97T0gV+5G7bf8vqY2qb3qmeASitEbg6wvJB LXXEUdERae0lCT7l1a/WQEgk5bgqO3vOdXZc2D4OmpD6WroZ1I03b3tY6P/vQb4owshqpTVlc/EOa eoRJnyd/s5fSwSRNgJ0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1on1Ll-002ULS-Qa; Mon, 24 Oct 2022 17:34:57 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1on1LY-002UHI-S7 for linux-arm-kernel@lists.infradead.org; Mon, 24 Oct 2022 17:34:47 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 29OHYaam050116; Mon, 24 Oct 2022 12:34:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1666632876; bh=k7acRMEz6LtOJEl0PqxtzzwFZfm8M1R3fsLPAYbkZRc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=qRyqoqkGKMJjBzM8E0CjsmTGb7LvrvZDHNdHnj7hUWNj/SBF7h49JZ1quMYcauNCD HA5vMoiKZ940D6CUEW/HZRQupi5tuyk1NCEx97v4Gdr+29r3RslFG6p/8YJ4wvHXn0 huO92A31H/QRhBcwGnf/0QTsjj2Np4JJqn0bNpGA= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 29OHYa3q019478 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 24 Oct 2022 12:34:36 -0500 Received: from DFLE112.ent.ti.com (10.64.6.33) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6; Mon, 24 Oct 2022 12:34:35 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6 via Frontend Transport; Mon, 24 Oct 2022 12:34:35 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 29OHYYIx039154; Mon, 24 Oct 2022 12:34:35 -0500 From: Andrew Davis To: Shawn Guo , Li Yang , Sascha Hauer , Rob Herring , Krzysztof Kozlowski , Nishanth Menon , Vignesh Raghavendra , Masahiro Yamada , Michal Marek , Nick Desaulniers , Geert Uytterhoeven , Frank Rowand CC: , , , , , Andrew Davis Subject: [PATCH v2 1/7] kbuild: Allow DTB overlays to built from .dtso named source files Date: Mon, 24 Oct 2022 12:34:28 -0500 Message-ID: <20221024173434.32518-2-afd@ti.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221024173434.32518-1-afd@ti.com> References: <20221024173434.32518-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221024_103445_024069_E292C5DD X-CRM114-Status: GOOD ( 10.54 ) 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 Currently DTB Overlays (.dtbo) are build from source files with the same extension (.dts) as the base DTs (.dtb). This may become confusing and even lead to wrong results. For example, a composite DTB (created from a base DTB and a set of overlays) might have the same name as one of the overlays that create it. Different files should be generated from differently named sources. .dtb <-> .dts .dtbo <-> .dtso We do not remove the ability to compile DTBO files from .dts files here, only add a new rule allowing the .dtso file name. The current .dts named overlays can be renamed with time. After all have been renamed we can remove the other rule. Signed-off-by: Andrew Davis Reviewed-by: Geert Uytterhoeven Tested-by: Geert Uytterhoeven Reviewed-by: Frank Rowand Tested-by: Frank Rowand --- scripts/Makefile.lib | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 3aa384cec76b8..0376a6f18bfb1 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -408,6 +408,9 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE $(call if_changed_dep,dtc) +$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE + $(call if_changed_dep,dtc) + dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) # Bzip2