summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-03-26 23:38:15 (GMT)
committerSimon Glass <sjg@chromium.org>2017-04-05 02:01:57 (GMT)
commit3c00a2c8b5e22e3eff9afb291e555b4bcba17d77 (patch)
treefbdb9729482b7d3b41700dfb088c77b1dac0920e
parent07352c96001e17377b8814e7d2efec0fbbbc2b89 (diff)
downloadu-boot-3c00a2c8b5e22e3eff9afb291e555b4bcba17d77.tar.xz
Makefile: Correct dependency race condition with TPL
At present we sometimes see the following build error when building on a machine with multiple cores. +make[2]: *** No rule to make target 'dts/dt.dtb', needed by 'tpl/u-boot-tpl.dtb'. Stop. Add a dependency to correct this. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d44af78..2638acf 100644
--- a/Makefile
+++ b/Makefile
@@ -1351,7 +1351,8 @@ spl/u-boot-spl.sfp: spl/u-boot-spl
spl/boot.bin: spl/u-boot-spl
@:
-tpl/u-boot-tpl.bin: tools prepare
+tpl/u-boot-tpl.bin: tools prepare \
+ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb)
$(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all
TAG_SUBDIRS := $(patsubst %,$(srctree)/%,$(u-boot-dirs) include)