Skip to content
Snippets Groups Projects
Commit a3444bd0 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini
Browse files

Revert "Ensure device tree DTS is compiled"


This reverts commit 27cb7300.

I am not sure if I correctly understood the log of commit 27cb7300
("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 2737dfe0 ("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 344db3f3
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment