From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Marek Subject: Re: [PATCH] kbuild: Don't assume dts files live in arch/*/boot/dts Date: Thu, 23 May 2013 10:15:53 +0200 Message-ID: <519DD039.4030107@suse.cz> References: <1368010744-11281-1-git-send-email-matthijs@stdin.nl> <518A6649.1020501@wwwdotorg.org> <20130518184101.GS25742@login.drsnuggles.stderr.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130518184101.GS25742@login.drsnuggles.stderr.nl> Sender: linux-kbuild-owner@vger.kernel.org To: Stephen Warren , Grant Likely , Rob Herring , linux-kbuild@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, Stephen Warren List-Id: devicetree@vger.kernel.org On 18.5.2013 20:41, Matthijs Kooijman wrote: > Hi Michal, > > On Wed, May 08, 2013 at 08:50:49AM -0600, Stephen Warren wrote: >> On 05/08/2013 04:59 AM, Matthijs Kooijman wrote: >>> In commit b40b25ff (kbuild: always run gcc -E on *.dts, remove cmd_dtc_cpp), >>> dts building was changed to always use the C preprocessor. This meant >>> that the .dts file passed to dtc is not the original, but the >>> preprocessed one. >>> >>> When compiling with a separate build directory (i.e., with O=), this >>> preprocessed file will not live in the same directory as the original. >>> When the .dts file includes .dtsi files, dtc will look for them in the >>> build directory, not in the source directory and compilation will fail. >>> >>> The commit referenced above tried to fix this by passing arch/*/boot/dts >>> as an include path to dtc. However, for mips, the .dts files are not in >>> this directory, so dts compilation on mips breaks for some targets. >>> >>> Instead of hardcoding this particular include path, this commit just >>> uses the directory of the .dts file that is being compiled, which >>> effectively restores the previous behaviour wrt includes. For most .dts >>> files, this path is just the same as the previous hardcoded >>> arch/*/boot/dts path. >>> >>> This was tested on a mips (rt3052) and an arm (bcm2835) target. >> >> Reviewed-by: Stephen Warren > > Did this patch look ok to you? If so, could you pick it up and send it > over to Linus for 3.10 (or should I send it directly)? I applied the patch to kbuild.git#rc-fixes now. Michal