common: print \n in initr_scsi()

[u-boot] / dts / Makefile

diff --git a/dts/Makefile b/dts/Makefile
index 5d2abd9f5c359f95a669e9db5e76cebe3fe745ac..36dfbe76d1ebb5f3fed0d3994262190bf70fd5a6 100644 (file)
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -1,38 +1,64 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # 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.
 
 DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%)
 ifeq ($(DEVICE_TREE),)
-DEVICE_TREE := notfound
+DEVICE_TREE := unset
 endif
 
-DTS := $(srctree)/arch/$(ARCH)/dts/$(DEVICE_TREE).dts
+ARCH_PATH := arch/$(ARCH)/dts
+dtb_depends := arch-dtbs
 
-DTC_FLAGS += -R 4 -p 0x1000
+ifneq ($(EXT_DTB),)
+DTB := $(EXT_DTB)
+else
+DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
+dtb_depends += $(DTB:.dtb=.dts)
+endif
 
-$(obj)/dt.dtb: $(DTS) FORCE
-       $(call if_changed_dep,dtc)
+$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
+       $(call if_changed,fdtgrep)
 
-targets += dt.dtb
+$(obj)/dt.dtb: $(DTB) FORCE
+       $(call if_changed,shipped)
 
-$(DTS):
-       @echo >&2
-       @echo >&2 "Device Tree Source is not specified."
-       @echo >&2 "Please define 'CONFIG_DEFAULT_DEVICE_TREE'"
-       @echo >&2 "or build with 'DEVICE_TREE=<dts-file-name>' argument"
-       @/bin/false
+targets += dt.dtb dt-spl.dtb
+
+$(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.";      \
+       echo >&2 "Please define 'CONFIG_DEFAULT_DEVICE_TREE'";          \
+       echo >&2 "or build with 'DEVICE_TREE=<device_tree>' argument";  \
+       echo >&2;                                                       \
+       /bin/false)
 
-.SECONDARY: $(obj)/dt.dtb.S
+arch-dtbs:
+       $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
 
+.SECONDARY: $(obj)/dt.dtb.S $(obj)/dt-spl.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
+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
+subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/mips/dts ../arch/sandbox/dts ../arch/x86/dts