[U-Boot] [PATCH 1/3] Makefile: Correct dependency race condition with TPL

Heiko Stuebner
2017-03-27T19:39:35Z

Am Sonntag, 26. MÃ¤rz 2017, 17:38:15 CEST schrieb Simon Glass:
> 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>

Fixes the build of rk3188-rock board using buildman for me with more than
one job, which failed very reliable before, so

Tested-by: Heiko Stuebner <heiko@sntech.de>

> ---
>
> Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 1001bc5a7b..5e82b78ade 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)
>