[PATCH 2/2] kbuild: Don't assume dts files live in arch/*/boot/dts

Masahiro Yamada yamada.masahiro at socionext.com
Wed Oct 21 20:34:07 PDT 2015


Barebox has not adopted arch/$(SRCARCH)/dts/$(VENDOR)/ directory
to contain device trees yet, but it is possible in the future.
(you can see that in ARM64 Linux)

It is better to use $(dir $<) rather than hardcoding the particular
include path (and this is the way used in Linux).

Refer commit ad06156876c0e55a01e13e1f2dd5c7f9262b1dfa ("kbuild: Don't
assume dts files live in arch/*/boot/dts") of Linux.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index c529d15..46ced28 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -257,7 +257,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb $(srctree)/scripts/gen-dtb-s FORCE
 quiet_cmd_dtc = DTC     $@
 cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
 	$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
-		-i $(srctree)/arch/$(SRCARCH)/dts $(DTC_FLAGS) \
+		-i $(dir $<) $(DTC_FLAGS) \
 		-i $(srctree)/dts/src/ \
 		-d $(depfile).dtc $(dtc-tmp) ; \
 	cat $(depfile).pre $(depfile).dtc > $(depfile)
-- 
1.9.1




More information about the barebox mailing list