imx: hab: Check if CSF contains deprecated commands

[people/ms/u-boot.git] / dts / Makefile

diff --git a/dts/Makefile b/dts/Makefile
index 6c7198f65ff565da9d305d318f1047551c5764cc..779c9ec5c3d102db719682003d768f29451f9d3c 100644 (file)
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -7,64 +7,60 @@
 # 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),)
-$(if $(CONFIG_DEFAULT_DEVICE_TREE),,\
-$(error Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file))
-DEVICE_TREE = $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%)
+DEVICE_TREE := unset
 endif
 
-DTS_INCDIRS =  $(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts
-DTS_INCDIRS += $(SRCTREE)/board/$(VENDOR)/dts
-DTS_INCDIRS += $(SRCTREE)/arch/$(ARCH)/dts
+ARCH_PATH := arch/$(ARCH)/dts
+dtb_depends := arch-dtbs
 
-DTS_CPPFLAGS := -x assembler-with-cpp -undef -D__DTS__ \
-               -nostdinc $(addprefix -I,$(DTS_INCDIRS))
+ifneq ($(EXT_DTB),)
+DTB := $(EXT_DTB)
+else
+DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
+dtb_depends += $(DTB:.dtb=.dts)
+endif
+
+$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
+       $(call if_changed,fdtgrep)
+
+$(obj)/dt.dtb: $(DTB) FORCE
+       $(call if_changed,shipped)
 
-DTC_FLAGS := -R 4 -p 0x1000 \
-       $(addprefix -i ,$(DTS_INCDIRS))
+targets += dt.dtb dt-spl.dtb
 
-# Use a constant name for this so we can access it from C code.
-# objcopy doesn't seem to allow us to set the symbol name independently of
-# the filename.
-DT_BIN := $(obj)dt.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)
+
+arch-dtbs:
+       $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
 
-$(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
-       $(CPP) $(DTS_CPPFLAGS) $< -o $(DT_BIN).dts.tmp
-       $(DTC) $(DTC_FLAGS) -O dtb -o ${DT_BIN} $(DT_BIN).dts.tmp
+.SECONDARY: $(obj)/dt.dtb.S $(obj)/dt-spl.dtb.S
 
-process_lds = \
-       $(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p'
 
-# Run the compiler and get the link script from the linker
-GET_LDS = $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--verbose 2>&1
+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
 
-$(obj)dt.o: $(DT_BIN)
-       # We want the output format and arch.
-       # We also hope to win a prize for ugliest Makefile / shell interaction
-       # We look in the LDSCRIPT first.
-       # Then try the linker which should give us the answer.
-       # Then check it worked.
-       [ -n "$(LDSCRIPT)" ] && \
-               oformat=`$(call process_lds,cat $(LDSCRIPT),FORMAT)` && \
-               oarch=`$(call process_lds,cat $(LDSCRIPT),ARCH)` ;\
-       \
-       [ -z $${oformat} ] && \
-               oformat=`$(call process_lds,$(GET_LDS),FORMAT)` ;\
-       [ -z $${oarch} ] && \
-               oarch=`$(call process_lds,$(GET_LDS),ARCH)` ;\
-       \
-       [ -z $${oformat} ] && \
-               echo "Cannot read OUTPUT_FORMAT from lds file $(LDSCRIPT)" && \
-               exit 1 || true ;\
-       [ -z $${oarch} ] && \
-               echo "Cannot read OUTPUT_ARCH from lds file $(LDSCRIPT)" && \
-               exit 1 || true ;\
-       \
-       cd $(dir ${DT_BIN}) && \
-       $(OBJCOPY) -I binary -O $${oformat} -B $${oarch} \
-               $(notdir ${DT_BIN}) $@
-       rm $(DT_BIN)
+dtbs: $(obj)/dt.dtb $(obj)/dt-spl.dtb
+       @:
 
-obj-$(CONFIG_OF_EMBED) := dt.o
+clean-files := dt.dtb.S dt-spl.dtb.S
 
-binary:        $(DT_BIN)
+# Let clean descend into dts directories
+subdir- += ../arch/arm/dts ../arch/microblaze/dts ../arch/mips/dts ../arch/sandbox/dts ../arch/x86/dts