mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
devicetree: Move include prefixes from arch to separate directory
We use a directory under arch/$ARCH/boot/dts as an include path
that has links outside of the subtree to find dt-bindings from under
include/dt-bindings. That's been working well, but new DT architectures
haven't been adding them by default.
Recently there's been a desire to share some of the DT material between
arm and arm64, which originally caused developers to create symlinks or
relative includes between the subtrees. This isn't ideal -- it breaks
if the DT files aren't stored in the exact same hierarchy as the kernel
tree, and generally it's just icky.
As a somewhat cleaner solution we decided to add a $ARCH/ prefix link
once, and allow DTS files to reference dtsi (and dts) files in other
architectures that way.
Original approach was to create these links under each architecture,
but it lead to the problem of recursive symlinks.
As a remedy, move the include link directories out of the architecture
trees into a common location. At the same time, they can now share one
directory and one dt-bindings/ link as well.
Fixes: 4027494ae6
('ARM: dts: add arm/arm64 include symlinks')
Reported-by: Russell King <linux@armlinux.org.uk>
Reported-by: Omar Sandoval <osandov@osandov.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: linux-arch <linux-arch@vger.kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
parent
5252d73756
commit
d5d332d3f7
@ -1 +0,0 @@
|
||||
..
|
@ -1 +0,0 @@
|
||||
../../../../arm64/boot/dts
|
@ -1 +0,0 @@
|
||||
../../../../../include/dt-bindings
|
@ -1 +0,0 @@
|
||||
../../../../arm/boot/dts
|
@ -1 +0,0 @@
|
||||
..
|
@ -1 +0,0 @@
|
||||
../../../../../include/dt-bindings
|
@ -1 +0,0 @@
|
||||
../../../../../include/dt-bindings
|
@ -1 +0,0 @@
|
||||
../../../../../include/dt-bindings
|
@ -1 +0,0 @@
|
||||
../../../../../include/dt-bindings
|
@ -1 +0,0 @@
|
||||
../../../../../include/dt-bindings
|
@ -175,7 +175,7 @@ ld_flags = $(LDFLAGS) $(ldflags-y)
|
||||
|
||||
dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
|
||||
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
|
||||
-I$(srctree)/arch/$(SRCARCH)/boot/dts/include \
|
||||
-I$(srctree)/scripts/dtc/include-prefixes \
|
||||
-I$(srctree)/drivers/of/testcase-data \
|
||||
-undef -D__DTS__
|
||||
|
||||
|
1
scripts/dtc/include-prefixes/arc
Symbolic link
1
scripts/dtc/include-prefixes/arc
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/arc/boot/dts
|
1
scripts/dtc/include-prefixes/arm
Symbolic link
1
scripts/dtc/include-prefixes/arm
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/arm/boot/dts
|
1
scripts/dtc/include-prefixes/arm64
Symbolic link
1
scripts/dtc/include-prefixes/arm64
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/arm64/boot/dts
|
1
scripts/dtc/include-prefixes/c6x
Symbolic link
1
scripts/dtc/include-prefixes/c6x
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/c6x/boot/dts
|
1
scripts/dtc/include-prefixes/cris
Symbolic link
1
scripts/dtc/include-prefixes/cris
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/cris/boot/dts
|
1
scripts/dtc/include-prefixes/dt-bindings
Symbolic link
1
scripts/dtc/include-prefixes/dt-bindings
Symbolic link
@ -0,0 +1 @@
|
||||
../../../include/dt-bindings
|
1
scripts/dtc/include-prefixes/h8300
Symbolic link
1
scripts/dtc/include-prefixes/h8300
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/h8300/boot/dts
|
1
scripts/dtc/include-prefixes/metag
Symbolic link
1
scripts/dtc/include-prefixes/metag
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/metag/boot/dts
|
1
scripts/dtc/include-prefixes/microblaze
Symbolic link
1
scripts/dtc/include-prefixes/microblaze
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/microblaze/boot/dts
|
1
scripts/dtc/include-prefixes/mips
Symbolic link
1
scripts/dtc/include-prefixes/mips
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/mips/boot/dts
|
1
scripts/dtc/include-prefixes/nios2
Symbolic link
1
scripts/dtc/include-prefixes/nios2
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/nios2/boot/dts
|
1
scripts/dtc/include-prefixes/openrisc
Symbolic link
1
scripts/dtc/include-prefixes/openrisc
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/openrisc/boot/dts
|
1
scripts/dtc/include-prefixes/powerpc
Symbolic link
1
scripts/dtc/include-prefixes/powerpc
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/powerpc/boot/dts
|
1
scripts/dtc/include-prefixes/sh
Symbolic link
1
scripts/dtc/include-prefixes/sh
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/sh/boot/dts
|
1
scripts/dtc/include-prefixes/xtensa
Symbolic link
1
scripts/dtc/include-prefixes/xtensa
Symbolic link
@ -0,0 +1 @@
|
||||
../../../arch/xtensa/boot/dts
|
Loading…
Reference in New Issue
Block a user