Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-Data: A9a23:d/oTRKLpEbkkMU47FE+RO5UlxSXFcZb7ZxGr2PjKsXjdYENSgjdVx
 zEdUDqCbP7cZmr8e4wnPojg80wGvZeBndZkGwEd+CA2RRqmiyZq6fd1j6vUF3nPRiEWZBs/t
 63yUvGZcIZsCCW0Si6FatANl1EkvU2zbue6WbWs1hxZH1c+En9w0U07xobVv6Yx6TSHK1LV0
 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eC/5UhN6/zEInqR5fOria4KcbhL
 wrL5OnREmo0ZH7BAPv9+lrwWhVirrI/oWFih1IOM5VOjCSuqQQT/7kgGvBHZnwMyBO3rfVNx
 /JKvNuZHFJB0q3kwIzxUjFCGC14eKZB4rKCeCL5us2IxEqAeHzpqxlsJBhpZstDpaAmWicXq
 axwxDMlNnhvg8q6ybS6R+1zj+woLdLgO8UUvXQIITTxXK16HsqeHPqWjTNe9GsIv/9FDeiOX
 dIUOAdoQTbvZR4RHkhCXfrSm8/x1iWgLFW0smm9oasx/niWzwFr1rXpGMTad8bMRshPmEuc4
 GXc8AzRBhAcKczayjCY83agrvHAkDm9W48IErC8sPlwjzW7wGAeExQLUV26rOOiokG5XN1bJ
 gof/S9Gha0z/0yiSp/5XBi8iHuNpB0bRdsWFeAmgCmIw7Hd4weDAXksTTNbbtEi8sgsSlQXO
 kShhdjlA3lkt6eYDCvHsLyVtji1fyMSKAfueBPoUyMkzsb4jotogSmUDfBdIouJgfryEHbZl
 mXiQDcFu50fissC1qOe9F/Bgi6xqpWhcuLTzliMNo5Cxl4kDLNJd7BE+nCAt6ccc9zxok2p+
 SlaxJDEs4jiGLnXzESwrPMx8KZFDhpvGAfdil5mBZU68DLFF5WLIt0IsGgWyKuEzq85ldLBe
 kTfv0Za44VeeSLwK6R2eIm2Tc8tyMAM9OgJtNiJP7KigbAoJGdrGR2Cg2bLhQgBd2B3yskC1
 W+zK5rEMJrjIf0PIMCKb+kcy6Q34Ss12HneQ5v2pzz+j+TEOSHIFexebgrRBgzc0E9iiFiFm
 zq4H5baoyizrMWiCsUq2ddJdAtTfSRT6W7e8pALJoZv3TaK6El4W6OOntvNiqRunr9eka/T7
 2qhV0pDoGcTdlWZQThmnktLMeu1Nb4m9CpTFXV1bT6AhSN5Ca7xt/h3SnfCVeR9nACV5aQqH
 6BtlgTpKqkndwkrDBxENcal99Y8JEzw7e9MVgL8CAUCk1dbb1Sh0rfZksHHrUHi0gLfWRMCn
 oCd
IronPort-HdrOrdr: A9a23:zoR4z62zwW9dUMbJFWxypgqjBL0kLtp133Aq2lEZdPWaSKClfq
 eV7ZYmPHDP5gr5NEtLpTniAtjifZqjz/9ICOAqVN/IYOCMggSVxe9ZgLcK6geQfhEWjtQ86U
 +lGJIOb+EZyjNB/KLH3DU=
From:   Daniel Walker <danielwa@cisco.com>
To:     Masahiro Yamada <masahiroy@kernel.org>,
        Michal Marek <michal.lkml@markovi.net>,
        Nick Desaulniers <ndesaulniers@google.com>
Cc:     xe-linux-external@cisco.com, linux-kbuild@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [RFC-PATCH] Makefile: dts: include directory makefile for DTC_FLAGS
Date:   Wed,  7 Sep 2022 16:03:38 -0700
Message-Id: <20220907230339.271633-1-danielwa@cisco.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The current Makefile will drop the DTC_FLAGS depending on how you
build. For example,

make dtbs

includes correct DTC_FLAGS. However if you run,

make nvidia/tegra210-p2371-2180.dtb

The DTC_FLAGS are dropped. This appears to be caused by the top level
Makefile not including the Makefile from the directory where the dts lives.

This normally doesn't matter because most dts files have nothing added
from the Makefile. This changes when you have overlays, and the
DTC_FLAGS modifier is mandatory for the dtb to work correctly.

This change adds a -f argument which includes the Makefile from the
directory where the dts file reside. This change is also required for
dtbo files.

Cc: xe-linux-external@cisco.com
Signed-off-by: Daniel Walker <danielwa@cisco.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ac16bd92b156..bc245e2dc8d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1460,10 +1460,10 @@ endif
 ifneq ($(dtstree),)
 
 %.dtb: dtbs_prepare
-	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
+	$(Q)$(MAKE) -f $(srctree)/$(dtstree)/$(dir $@)Makefile $(build)=$(dtstree) $(dtstree)/$@
 
 %.dtbo: dtbs_prepare
-	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
+	$(Q)$(MAKE) -f $(srctree)/$(dtstree)/$(dir $@)Makefile $(build)=$(dtstree) $(dtstree)/$@
 
 PHONY += dtbs dtbs_prepare dtbs_install dtbs_check
 dtbs: dtbs_prepare
-- 
2.25.1