From: Simon Glass Date: Mon, 4 Jul 2016 17:58:17 +0000 (-0600) Subject: dm: Don't attach the device tree to SPL with of-platdata X-Git-Tag: v2016.09-rc1~82^2~25 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d22199b166e7064ad68cba52be390b88f2de79c9;p=u-boot dm: Don't attach the device tree to SPL with of-platdata When of-platdata is used in SPL we don't use the device tree. So there is no point in attaching it. Adjust the Makefile to skip attaching the device tree when of-platdata is enabled. Signed-off-by: Simon Glass --- diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 324b03fb22..3ba974226b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -173,7 +173,7 @@ cmd_cat = cat $(filter-out $(PHONY), $^) > $@ quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ -ifeq ($(CONFIG_SPL_OF_CONTROL)$(CONFIG_OF_SEPARATE),yy) +ifeq ($(CONFIG_SPL_OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_SPL_OF_PLATDATA),yy) $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin $(obj)/$(SPL_BIN)-pad.bin \ $(obj)/$(SPL_BIN).dtb FORCE $(call if_changed,cat)