Revert "Ensure device tree DTS is compiled"
This reverts commit27cb7300ff
. I am not sure if I correctly understood the log of commit27cb7300ff
("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, commit2737dfe096
("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>
This commit is contained in:
parent
344db3f330
commit
a3444bd09a
13
dts/Makefile
13
dts/Makefile
@ -10,14 +10,10 @@ ifeq ($(DEVICE_TREE),)
|
|||||||
DEVICE_TREE := unset
|
DEVICE_TREE := unset
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ARCH_PATH := arch/$(ARCH)/dts
|
|
||||||
dtb_depends := arch-dtbs
|
|
||||||
|
|
||||||
ifneq ($(EXT_DTB),)
|
ifneq ($(EXT_DTB),)
|
||||||
DTB := $(EXT_DTB)
|
DTB := $(EXT_DTB)
|
||||||
else
|
else
|
||||||
DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
|
DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
|
||||||
dtb_depends += $(DTB:.dtb=.dts)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
|
$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
|
||||||
@ -28,10 +24,7 @@ $(obj)/dt.dtb: $(DTB) FORCE
|
|||||||
|
|
||||||
targets += dt.dtb dt-spl.dtb
|
targets += dt.dtb dt-spl.dtb
|
||||||
|
|
||||||
$(DTB): $(dtb_depends)
|
$(DTB): arch-dtbs
|
||||||
ifeq ($(EXT_DTB),)
|
|
||||||
$(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
|
|
||||||
endif
|
|
||||||
$(Q)test -e $@ || ( \
|
$(Q)test -e $@ || ( \
|
||||||
echo >&2; \
|
echo >&2; \
|
||||||
echo >&2 "Device Tree Source is not correctly specified."; \
|
echo >&2 "Device Tree Source is not correctly specified."; \
|
||||||
@ -42,7 +35,7 @@ endif
|
|||||||
|
|
||||||
PHONY += arch-dtbs
|
PHONY += arch-dtbs
|
||||||
arch-dtbs:
|
arch-dtbs:
|
||||||
$(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
|
$(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs
|
||||||
|
|
||||||
ifeq ($(CONFIG_SPL_BUILD),y)
|
ifeq ($(CONFIG_SPL_BUILD),y)
|
||||||
obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o
|
obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o
|
||||||
|
Loading…
Reference in New Issue
Block a user