summaryrefslogtreecommitdiff
path: root/dts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-03-14 14:58:36 +0900
committerTom Rini <trini@konsulko.com>2019-03-22 12:15:15 -0400
commita3444bd09af9d92b50149f239facbfc0f0d41290 (patch)
treed1a51c65fa40d1e1906d3020354003f73b2b67fc /dts
parent344db3f3307de7c852a0d112c4553a1161c108e7 (diff)
downloadu-boot-a3444bd09af9d92b50149f239facbfc0f0d41290.tar.gz
Revert "Ensure device tree DTS is compiled"
This reverts commit 27cb7300ffda7a3f1581f0f5a2d3bfe59b97ad67. I am not sure if I correctly understood the log of commit 27cb7300ffda ("Ensure device tree DTS is compiled"), but the code-diff looks like it was trying to solve the missed re-compilation when .dts was modified. Recently, commit 2737dfe096b6 ("kbuild: make arch-dtbs target PHONY") fixed the issue in a more correct and more complete way. Anyway, since the former commit, we see a clumsy log like this: make[2]: 'arch/sandbox/dts/sandbox.dtb' is up to date Another problem is, it created multiple paths to descend into arch/*/dts/, causing a race in parallel building. So, let's revert it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'dts')
-rw-r--r--dts/Makefile13
1 files changed, 3 insertions, 10 deletions
diff --git a/dts/Makefile b/dts/Makefile
index 4970223b3d..1f83e615e8 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -10,14 +10,10 @@ ifeq ($(DEVICE_TREE),)
DEVICE_TREE := unset
endif
-ARCH_PATH := arch/$(ARCH)/dts
-dtb_depends := arch-dtbs
-
ifneq ($(EXT_DTB),)
DTB := $(EXT_DTB)
else
-DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
-dtb_depends += $(DTB:.dtb=.dts)
+DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
endif
$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
@@ -28,10 +24,7 @@ $(obj)/dt.dtb: $(DTB) FORCE
targets += dt.dtb dt-spl.dtb
-$(DTB): $(dtb_depends)
-ifeq ($(EXT_DTB),)
- $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
-endif
+$(DTB): arch-dtbs
$(Q)test -e $@ || ( \
echo >&2; \
echo >&2 "Device Tree Source is not correctly specified."; \
@@ -42,7 +35,7 @@ endif
PHONY += arch-dtbs
arch-dtbs:
- $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
+ $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs
ifeq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o