* [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 2/5] ARM: dts: use #include "..." to include DT in the same directory Masahiro Yamada
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ 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] 9+ messages in thread* [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory
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 13:10 ` Shawn Guo
2017-05-15 11:14 ` [PATCH 3/5] powerpc: " Masahiro Yamada
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ 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-kernel,
Rob Herring, linux-arm-kernel, Shawn Guo
Most of DT files in ARM use #include "..." to make pre-processor
include DT in the same directory, but we have 3 exceptional files
that use #include <...> for that.
They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
path from dtc_cpp_flags.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
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 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
index b2d3466..6be8a1e 100644
--- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
@@ -41,8 +41,8 @@
/dts-v1/;
-#include <imx6q.dtsi>
-#include <imx6qdl-zii-rdu2.dtsi>
+#include "imx6q.dtsi"
+#include "imx6qdl-zii-rdu2.dtsi"
/ {
model = "ZII RDU2 Board";
diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
index 882b3bd..547a766 100644
--- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
@@ -41,8 +41,8 @@
/dts-v1/;
-#include <imx6qp.dtsi>
-#include <imx6qdl-zii-rdu2.dtsi>
+#include "imx6qp.dtsi"
+#include "imx6qdl-zii-rdu2.dtsi"
/ {
model = "ZII RDU2+ Board";
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index 33a8eb2..06e2331 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -1,4 +1,4 @@
-#include <versatile-ab.dts>
+#include "versatile-ab.dts"
/ {
model = "ARM Versatile PB";
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory
2017-05-15 11:14 ` [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory Masahiro Yamada
@ 2017-05-15 13:10 ` Shawn Guo
2017-05-16 11:53 ` Masahiro Yamada
2017-05-24 5:07 ` Masahiro Yamada
0 siblings, 2 replies; 9+ messages in thread
From: Shawn Guo @ 2017-05-15 13:10 UTC (permalink / raw)
To: Masahiro Yamada
Cc: devicetree, linux-arch, Mark Rutland, linux-kernel, Russell King,
Gaurav Minocha, Olof Johansson, Rob Herring, Sascha Hauer,
Grant Likely, Omar Sandoval, Frank Rowand, Fabio Estevam,
linux-arm-kernel
Hi Masahiro,
On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
> Most of DT files in ARM use #include "..." to make pre-processor
> include DT in the same directory, but we have 3 exceptional files
> that use #include <...> for that.
>
> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
> path from dtc_cpp_flags.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 ++--
> arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
I see this patch depends on nothing and can be applied immediately. But
versatile-pb.dts is not really in my charge. In case you want to get
this series merged by arm-soc folks, here is my ACK:
Acked-by: Shawn Guo <shawnguo@kernel.org>
Or you need to split versatile-pb.dts out, and then I can take it.
Shawn
> arch/arm/boot/dts/versatile-pb.dts | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> index b2d3466..6be8a1e 100644
> --- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> +++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> @@ -41,8 +41,8 @@
>
> /dts-v1/;
>
> -#include <imx6q.dtsi>
> -#include <imx6qdl-zii-rdu2.dtsi>
> +#include "imx6q.dtsi"
> +#include "imx6qdl-zii-rdu2.dtsi"
>
> / {
> model = "ZII RDU2 Board";
> diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> index 882b3bd..547a766 100644
> --- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> +++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> @@ -41,8 +41,8 @@
>
> /dts-v1/;
>
> -#include <imx6qp.dtsi>
> -#include <imx6qdl-zii-rdu2.dtsi>
> +#include "imx6qp.dtsi"
> +#include "imx6qdl-zii-rdu2.dtsi"
>
> / {
> model = "ZII RDU2+ Board";
> diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
> index 33a8eb2..06e2331 100644
> --- a/arch/arm/boot/dts/versatile-pb.dts
> +++ b/arch/arm/boot/dts/versatile-pb.dts
> @@ -1,4 +1,4 @@
> -#include <versatile-ab.dts>
> +#include "versatile-ab.dts"
>
> / {
> model = "ARM Versatile PB";
> --
> 2.7.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory
2017-05-15 13:10 ` Shawn Guo
@ 2017-05-16 11:53 ` Masahiro Yamada
2017-05-24 5:07 ` Masahiro Yamada
1 sibling, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2017-05-16 11:53 UTC (permalink / raw)
To: Shawn Guo
Cc: devicetree, linux-arch, Mark Rutland, Linux Kernel Mailing List,
Russell King, Gaurav Minocha, Olof Johansson, Rob Herring,
Sascha Hauer, Grant Likely, Omar Sandoval, Frank Rowand,
Fabio Estevam, linux-arm-kernel
Hi Shawn,
2017-05-15 22:10 GMT+09:00 Shawn Guo <shawnguo@kernel.org>:
> Hi Masahiro,
>
> On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
>> Most of DT files in ARM use #include "..." to make pre-processor
>> include DT in the same directory, but we have 3 exceptional files
>> that use #include <...> for that.
>>
>> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
>> path from dtc_cpp_flags.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>> arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 ++--
>> arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
>
> I see this patch depends on nothing and can be applied immediately. But
> versatile-pb.dts is not really in my charge. In case you want to get
> this series merged by arm-soc folks, here is my ACK:
>
> Acked-by: Shawn Guo <shawnguo@kernel.org>
>
> Or you need to split versatile-pb.dts out, and then I can take it.
>
> Shawn
This is needed for 4/5:
https://patchwork.kernel.org/patch/9726697/
Probably, no need to rush for this series.
So, perhaps we can apply DT changes for v4.13 (by splitting per-platform),
then Makefile changes for 4.14.
I will wait for comments for a while (if any).
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory
2017-05-15 13:10 ` Shawn Guo
2017-05-16 11:53 ` Masahiro Yamada
@ 2017-05-24 5:07 ` Masahiro Yamada
1 sibling, 0 replies; 9+ messages in thread
From: Masahiro Yamada @ 2017-05-24 5:07 UTC (permalink / raw)
To: Shawn Guo
Cc: devicetree, linux-arch, Mark Rutland, Linux Kernel Mailing List,
Russell King, Gaurav Minocha, Olof Johansson, Rob Herring,
Sascha Hauer, Grant Likely, Omar Sandoval, Frank Rowand,
Fabio Estevam, linux-arm-kernel
Hi Shawn,
2017-05-15 22:10 GMT+09:00 Shawn Guo <shawnguo@kernel.org>:
> Hi Masahiro,
>
> On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
>> Most of DT files in ARM use #include "..." to make pre-processor
>> include DT in the same directory, but we have 3 exceptional files
>> that use #include <...> for that.
>>
>> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
>> path from dtc_cpp_flags.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>> arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 ++--
>> arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
>
> I see this patch depends on nothing and can be applied immediately. But
> versatile-pb.dts is not really in my charge. In case you want to get
> this series merged by arm-soc folks, here is my ACK:
>
> Acked-by: Shawn Guo <shawnguo@kernel.org>
>
> Or you need to split versatile-pb.dts out, and then I can take it.
>
> Shawn
I split it out.
Please pick up the imx6 one. Thanks!
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/5] powerpc: dts: use #include "..." to include DT in the same directory
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 2/5] ARM: dts: use #include "..." to include DT in the same directory Masahiro Yamada
@ 2017-05-15 11:14 ` Masahiro Yamada
2017-05-15 11:14 ` [PATCH 4/5] of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP 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
4 siblings, 0 replies; 9+ 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, Michael Ellerman, Benjamin Herrenschmidt,
linux-kernel, Paul Mackerras, Rob Herring, linuxppc-dev
Most of DT files in PowerPC use #include "..." to make pre-processor
include DT in the same directory, but we have 3 exceptional files
that use #include <...> for that.
They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
path from dtc_cpp_flags.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/powerpc/boot/dts/ac14xx.dts | 2 +-
arch/powerpc/boot/dts/mpc5121ads.dts | 2 +-
arch/powerpc/boot/dts/pdm360ng.dts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
index 27fcabc..83bcfd8 100644
--- a/arch/powerpc/boot/dts/ac14xx.dts
+++ b/arch/powerpc/boot/dts/ac14xx.dts
@@ -10,7 +10,7 @@
*/
-#include <mpc5121.dtsi>
+#include "mpc5121.dtsi"
/ {
model = "ac14xx";
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index 75888ce..73c3062 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -9,7 +9,7 @@
* option) any later version.
*/
-#include <mpc5121.dtsi>
+#include "mpc5121.dtsi"
/ {
model = "mpc5121ads";
diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
index 0cec724..445b881 100644
--- a/arch/powerpc/boot/dts/pdm360ng.dts
+++ b/arch/powerpc/boot/dts/pdm360ng.dts
@@ -13,7 +13,7 @@
* option) any later version.
*/
-#include <mpc5121.dtsi>
+#include "mpc5121.dtsi"
/ {
model = "pdm360ng";
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ 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
` (2 preceding siblings ...)
2017-05-15 11:14 ` [PATCH 3/5] powerpc: " 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
4 siblings, 0 replies; 9+ 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] 9+ 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
` (3 preceding siblings ...)
2017-05-15 11:14 ` [PATCH 4/5] of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP Masahiro Yamada
@ 2017-05-15 11:14 ` Masahiro Yamada
4 siblings, 0 replies; 9+ 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] 9+ messages in thread