On 03/04/2013 01:44 AM, Grant Likely wrote: > On Wed, 13 Feb 2013 14:33:15 -0700, Stephen Warren <swarren@xxxxxxxxxxxxx> wrote: >> From: Stephen Warren <swarren@xxxxxxxxxx> >> >> This enables a C pre-processor pass on all Tegra device trees. This >> allows future use of #defines and header files in order to define names >> for various constants, such as the IDs and flags in GPIO specifiers. >> Use of those features will increase the readability of the device tree >> files. >> >> Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx> >> --- >> arch/arm/boot/dts/tegra114-dalmore.dts | 21 - >> arch/arm/boot/dts/tegra114-dalmore.dtsp | 21 + > > Two comments; > 1) Use '-M' when posting patches that rename files, it makes for a much > smaller diff. :-) Yes, I forgot this:-( I reposted just this patch with -M IIRC (but maybe I don't!) > 2) Now that I see this patch, it's rather striking that .dtsp and .dtsip > are horible extensions (so are .dts and .dtsi for that matter, but > this just kicks it up a notch). Can we not do something better? > > Can we do something else here; First, does the old style /include/ > directives cause any problems existing .dts files? I know it won't work > if a /include/'ed file uses a #include statement, but the other way > around should be fine. Can we instead move the entire tree over to > building with the CPP enabled? Overall it will be less horribleness for > the end user. I think syntactically, now that the *.dtsp->*.dtb rule uses gcc -x assembler-with-cpp, the only issue would be *.dts that have a # in the very first column. That's probably rare enough that we can ignore the issue. A quick grep certainly shows this isn't an issue with any file in arch/*/boot/dts in the kernel tree right now. The main reason I didn't go down this route is that dependencies don't work, at least with the kbuild rules as currently implemented. The reason is that with /include/, dependencies are emitted by dtc, and with #include, dependencies are emitted by cpp. Currently, the *.dts->*.dtb rules only look at the dtc-emitted dependencies, and the *.dtsp->*.dtb rules only look at the cpp-emitted dependencies. The solution here would be to augment the dtc+cpp rule to merge together the two sets of dependencies in a post-processing step. This might be easy; I'd have to look at the existing dependency post-processing script to see if it already handles a case like this. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
