projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: dts: s900: Add UART node
[platform/kernel/u-boot.git]
/
dts
/
Makefile
diff --git
a/dts/Makefile
b/dts/Makefile
index
9907463
..
36dfbe7
100644
(file)
--- a/
dts/Makefile
+++ b/
dts/Makefile
@@
-1,8
+1,6
@@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2011 The Chromium OS Authors.
#
# Copyright (c) 2011 The Chromium OS Authors.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
# This Makefile builds the internal U-Boot fdt if CONFIG_OF_CONTROL is
# enabled. See doc/README.fdt-control for more details.
# This Makefile builds the internal U-Boot fdt if CONFIG_OF_CONTROL is
# enabled. See doc/README.fdt-control for more details.
@@
-12,17
+10,28
@@
ifeq ($(DEVICE_TREE),)
DEVICE_TREE := unset
endif
DEVICE_TREE := unset
endif
-DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
+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)
+endif
-quiet_cmd_copy = COPY $@
- cmd_copy = cp $< $@
+$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
+ $(call if_changed,fdtgrep)
$(obj)/dt.dtb: $(DTB) FORCE
$(obj)/dt.dtb: $(DTB) FORCE
- $(call if_changed,
copy
)
+ $(call if_changed,
shipped
)
-targets += dt.dtb
+targets += dt.dtb
dt-spl.dtb
-$(DTB): arch-dtbs
+$(DTB): $(dtb_depends)
+ifeq ($(EXT_DTB),)
+ $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
+endif
$(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."; \
@@
-32,16
+41,24
@@
$(DTB): arch-dtbs
/bin/false)
arch-dtbs:
/bin/false)
arch-dtbs:
- $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs
+ $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
+
+.SECONDARY: $(obj)/dt.dtb.S $(obj)/dt-spl.dtb.S
-.SECONDARY: $(obj)/dt.dtb.S
+ifeq ($(CONFIG_SPL_BUILD),y)
+obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o
+# support "out-of-tree" build for dtb-spl
+$(obj)/dt-spl.dtb.o: $(obj)/dt-spl.dtb.S FORCE
+ $(call if_changed_dep,as_o_S)
+else
obj-$(CONFIG_OF_EMBED) := dt.dtb.o
obj-$(CONFIG_OF_EMBED) := dt.dtb.o
+endif
-dtbs: $(obj)/dt.dtb
+dtbs: $(obj)/dt.dtb
$(obj)/dt-spl.dtb
@:
@:
-clean-files := dt.dtb.S
+clean-files := dt.dtb.S
dt-spl.dtb.S
# Let clean descend into dts directories
# Let clean descend into dts directories
-subdir- += ../arch/
*
/dts
+subdir- += ../arch/
arm/dts ../arch/microblaze/dts ../arch/mips/dts ../arch/sandbox/dts ../arch/x86
/dts