Thread (10 messages) 10 messages, 4 authors, 2015-07-31

[PATCH v2] dtb: Create a common home for cross-architecture dtsi files.

From: Ian Campbell <hidden>
Date: 2015-07-29 13:23:04
Also in: linux-devicetree, linux-kbuild, lkml

On Wed, 2015-07-29 at 20:07 +0900, Masahiro Yamada wrote:
Hi Ian,


2015-07-27 19:35 GMT+09:00 Ian Campbell [off-list ref]:
quoted
Commit 9ccd608070b6 "arm64: dts: add device tree for ARM SMM-A53x2 on
LogicTile Express 20MG" added a new dts file to arch/arm64 which
included "../../../../arm/boot/dts/vexpress-v2m-rs1.dtsi", i.e. a
.dtsi supplied by arch/arm.

Unfortunately this causes some issues for the split device tree
repository[0], since things get moved around there. In that context
the new .dts ends up at src/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts
while the include is at src/arm/vexpress-v2m-rs1.dtsi.

The sharing of the .dtsi is legitimate since the baseboard is the same
for various vexpress systems whatever processor they use.

Rather than using ../../ tricks to pickup .dtsi files from another
arch this patch creates a new directory include/dt-dtsi as a
home for such cross-arch .dtsi files, arranges for it to be in the
include path when the .dts files are processed by cpp and switches the

"include/dt-dtsi/"  can be referenced from normal C sources.

I think another possible home for cross-arch DTSI is "kernel/dts/".
This directory can be hidden from C sources.
I suppose, I don't really mind and will follow the direction of the other
DTB maintainers. It doesn't seem like a big deal to me.
quoted
@@ -223,7 +223,7 @@ Example of a VE tile description (simplified)
                /* Active high IRQ 0 is connected to GIC's SPI0 */
                interrupt-map = <0 0 0 &gic 0 0 4>;

-               /include/ "vexpress-v2m-rs1.dtsi"
+               #include <arm/vexpress-v2m-rs1.dtsi>
        };
 };


You do not have to replace /include/ with #include,
if you add the include path for DTC.
Ah, I looked for this but -i is not documented in the man page.

Is there any reason to prefer one over the other?
Please add include path for DTC too
so that both /include/ and #include are available.
OK.

I shall await further feedback on what path to use before spinning a v3.

Ian.
quoted hunk ↗ jump to hunk

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 79e8661..fc6c06c 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -285,7 +285,7 @@ quiet_cmd_dtc = DTC     $@
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
        $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; 
\
        $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
-               -i $(dir $<) $(DTC_FLAGS) \
+               -i $(dir $<) -i $(srctree)/kernel/dts $(DTC_FLAGS) \
                -d $(depfile).dtc.tmp $(dtc-tmp) ; \
        cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)


Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help