* [PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference
@ 2017-05-15 11:14 Masahiro Yamada
2017-05-15 11:14 ` [PATCH 1/5] of: remove drivers/of/testcase-data from include search path for CPP Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-05-15 11:14 UTC (permalink / raw
To: devicetree
Cc: linux-arch, Omar Sandoval, Gaurav Minocha, Grant Likely,
Frank Rowand, Mark Rutland, Olof Johansson, Russell King,
Masahiro Yamada, Fabio Estevam, Sascha Hauer, linux-kbuild,
Michal Marek, Michael Ellerman, Benjamin Herrenschmidt,
linux-kernel, Paul Mackerras, Rob Herring, linux-arm-kernel,
linuxppc-dev, Shawn Guo
This series depends on Olof's
"devicetree: Move include prefixes from arch to separate directory"
https://patchwork.kernel.org/patch/9724995/
1/5: clean-up of unused include path
2/5: Fixup of last three DT files in ARM (needed for 4/5)
3/5: Fixup of last three DT files in PowerPC (needed for 4/5)
4/5: Remove arch/$(SRCARCH)/boot/dts include path
5/5: Make DT cross-arch reference available for /include/ directive
Masahiro Yamada (5):
of: remove drivers/of/testcase-data from include search path for CPP
ARM: dts: use #include "..." to include DT in the same directory
powerpc: dts: use #include "..." to include DT in the same directory
of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP
of: add scripts/dtc/include-prefixes to search path for both CPP and
DTC
arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 ++--
arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
arch/arm/boot/dts/versatile-pb.dts | 2 +-
arch/powerpc/boot/dts/ac14xx.dts | 2 +-
arch/powerpc/boot/dts/mpc5121ads.dts | 2 +-
arch/powerpc/boot/dts/pdm360ng.dts | 2 +-
scripts/Makefile.lib | 8 ++++----
7 files changed, 12 insertions(+), 12 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/5] of: remove drivers/of/testcase-data from include search path for CPP
2017-05-15 11:14 [PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference Masahiro Yamada
@ 2017-05-15 11:14 ` Masahiro Yamada
2017-05-15 11:14 ` [PATCH 4/5] of: remove arch/$(SRCARCH)/boot/dts " Masahiro Yamada
2017-05-15 11:14 ` [PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-05-15 11:14 UTC (permalink / raw
To: devicetree
Cc: linux-arch, Omar Sandoval, Gaurav Minocha, Grant Likely,
Frank Rowand, Mark Rutland, Olof Johansson, Russell King,
Masahiro Yamada, Michal Marek, linux-kernel, linux-kbuild
This search path was added by commit b5190516b282 ("of: Move testcase
FDT data into drivers/of"). At that time, it was needed for platform
DT files to include testcase data.
It became unnecessary when commit ae9304c9d311 ("Adding selftest
testdata dynamically into live tree") introduced dynamic addition of
testcase data, but it missed to delete this search path.
Moreover, the directory drivers/of/testcase-data does not exist since
commit 19fd74879a32 ("of/unittest: Rename selftest.c to unittest.c").
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/Makefile.lib | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 58c05e5..011d464 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -176,7 +176,6 @@ ld_flags = $(LDFLAGS) $(ldflags-y)
dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
-I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/scripts/dtc/include-prefixes \
- -I$(srctree)/drivers/of/testcase-data \
-undef -D__DTS__
# Finds the multi-part object the current object will be linked into
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/5] of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP
2017-05-15 11:14 [PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference Masahiro Yamada
2017-05-15 11:14 ` [PATCH 1/5] of: remove drivers/of/testcase-data from include search path for CPP Masahiro Yamada
@ 2017-05-15 11:14 ` Masahiro Yamada
2017-05-15 11:14 ` [PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-05-15 11:14 UTC (permalink / raw
To: devicetree
Cc: linux-arch, Omar Sandoval, Gaurav Minocha, Grant Likely,
Frank Rowand, Mark Rutland, Olof Johansson, Russell King,
Masahiro Yamada, Michal Marek, linux-kernel, linux-kbuild
Having arch/$(SRCARCH)/boot/dts as an include search path is not
very useful these days because some architectures such as ARM64,
MIPS have no DT in this directory. Instead, they have DT in vendor
sub-directories.
With some DT files in ARM and PowerPC fixed, we can now drop this
include search path.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/Makefile.lib | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 011d464..9c8f38a 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -174,7 +174,6 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
ld_flags = $(LDFLAGS) $(ldflags-y)
dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
- -I$(srctree)/arch/$(SRCARCH)/boot/dts \
-I$(srctree)/scripts/dtc/include-prefixes \
-undef -D__DTS__
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC
2017-05-15 11:14 [PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference Masahiro Yamada
2017-05-15 11:14 ` [PATCH 1/5] of: remove drivers/of/testcase-data from include search path for CPP Masahiro Yamada
2017-05-15 11:14 ` [PATCH 4/5] of: remove arch/$(SRCARCH)/boot/dts " Masahiro Yamada
@ 2017-05-15 11:14 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-05-15 11:14 UTC (permalink / raw
To: devicetree
Cc: linux-arch, Omar Sandoval, Gaurav Minocha, Grant Likely,
Frank Rowand, Mark Rutland, Olof Johansson, Russell King,
Masahiro Yamada, Michal Marek, linux-kernel, linux-kbuild
We had include/dt-bindings as an include path only for CPP, and this
makes sense because header files in dt-bindings contain useful macros
that parsed by pre-processor.
Commit 4027494ae6e3 ("ARM: dts: add arm/arm64 include symlinks") and
commit 0a6081b673bb ("arm64: dts: add arm/arm64 include symlinks")
allow us cross-arch DT reference, but this is only available for
CPP's include directives, like
#include <arm/foo.dtsi>
It makes as much sense to include DT from another architecture by
DTC's builtin include directive, like
/include/ "arm/foo.dtsi"
To achieve this, scripts/dtc/include-prefixes should be passed to
both CPP and DTC. I refactored Makefile.lib a bit to not repeat the
same path.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/Makefile.lib | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 9c8f38a..dcc0d5f 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -173,8 +173,10 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
ld_flags = $(LDFLAGS) $(ldflags-y)
+DTC_INCLUDE := $(srctree)/scripts/dtc/include-prefixes
+
dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \
- -I$(srctree)/scripts/dtc/include-prefixes \
+ $(addprefix -I,$(DTC_INCLUDE)) \
-undef -D__DTS__
# Finds the multi-part object the current object will be linked into
@@ -315,7 +317,7 @@ quiet_cmd_dtc = DTC $@
cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
$(DTC) -O dtb -o $@ -b 0 \
- -i $(dir $<) $(DTC_FLAGS) \
+ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
-d $(depfile).dtc.tmp $(dtc-tmp) ; \
cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-15 11:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-15 11:14 [PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference Masahiro Yamada
2017-05-15 11:14 ` [PATCH 1/5] of: remove drivers/of/testcase-data from include search path for CPP Masahiro Yamada
2017-05-15 11:14 ` [PATCH 4/5] of: remove arch/$(SRCARCH)/boot/dts " Masahiro Yamada
2017-05-15 11:14 ` [PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).