From 3c00a2c8b5e22e3eff9afb291e555b4bcba17d77 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 26 Mar 2017 17:38:15 -0600 Subject: [PATCH] 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 Tested-by: Heiko Stuebner --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)