dts: add property removal option CONFIG_OF_REMOVE_PROPS

[oweals/u-boot.git] / dts / Makefile

diff --git a/dts/Makefile b/dts/Makefile
index dbde7035aa556d5f3060dfe81eac13a6e8b445b8..a20930eb9a5e656bbdedf924e4f754c7da7552e4 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.
-#
-# 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.
@@ -18,10 +16,18 @@ else
 DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
 endif
 
+$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
+       $(call if_changed,fdtgrep)
+
+ifeq ($(CONFIG_OF_DTB_PROPS_REMOVE),y)
+$(obj)/dt.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
+       $(call if_changed,fdt_rm_props)
+else
 $(obj)/dt.dtb: $(DTB) FORCE
        $(call if_changed,shipped)
+endif
 
-targets += dt.dtb
+targets += dt.dtb dt-spl.dtb
 
 $(DTB): arch-dtbs
        $(Q)test -e $@ || (                                             \
@@ -32,17 +38,23 @@ $(DTB): arch-dtbs
        echo >&2;                                                       \
        /bin/false)
 
+PHONY += arch-dtbs
 arch-dtbs:
        $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs
 
-.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
+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/*/dts
+subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/mips/dts ../arch/sandbox/dts ../arch/x86/dts ../arch/powerpc/dts ../arch/riscv/dts