projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: nfs: remove superfluous packed attribute
[oweals/u-boot.git]
/
dts
/
Makefile
diff --git
a/dts/Makefile
b/dts/Makefile
index a7a604303cc63ae836b8c4c16635514c24e6c3ef..1f83e615e8aa9a07c97e6589a6ae87e25a874569 100644
(file)
--- a/
dts/Makefile
+++ b/
dts/Makefile
@@
-10,14
+10,10
@@
ifeq ($(DEVICE_TREE),)
DEVICE_TREE := unset
endif
DEVICE_TREE := unset
endif
-ARCH_PATH := arch/$(ARCH)/dts
-dtb_depends := arch-dtbs
-
ifneq ($(EXT_DTB),)
DTB := $(EXT_DTB)
else
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
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
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."; \
$(Q)test -e $@ || ( \
echo >&2; \
echo >&2 "Device Tree Source is not correctly specified."; \
@@
-40,8
+33,9
@@
endif
echo >&2; \
/bin/false)
echo >&2; \
/bin/false)
+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)
obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o
ifeq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o