From 4857f7b34611500d93508a4191af2a69375c1316 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 30 Jan 2017 15:29:34 +0100 Subject: [PATCH] UPSTREAM: build system: mark sub-make invocations as parallelizable We rely on gnu make, so we can expect the jobserver to be around in parallel builds, too. Avoids some make warnings and slightly speeds up the build if those sub-makes are executed (eg for arm-trusted-firmware and vboot). BUG=none BRANCH=none TEST=none Change-Id: I858f72696b7a3f3491ca950b4374735cbb363bb7 Signed-off-by: Patrick Georgi Original-Commit-Id: 78a5f22994da63bb02882aacb68cbbb70c2606ac Original-Change-Id: I0e6a77f2813f7453d53e88e0214ad8c1b8689042 Original-Signed-off-by: Patrick Georgi Original-Reviewed-on: https://review.coreboot.org/18263 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/435403 --- Makefile | 2 +- Makefile.inc | 4 ++-- src/arch/arm64/Makefile.inc | 4 ++-- src/vboot/Makefile.inc | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 29730302b0..4a05890dfe 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ real-all: real-target .SECONDEXPANSION: $(KCONFIG_AUTOHEADER): $(KCONFIG_CONFIG) - $(MAKE) oldconfig + +$(MAKE) oldconfig # Add a new class of source/object files to the build system add-class= \ diff --git a/Makefile.inc b/Makefile.inc index cbbab87607..8f5086111e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -274,7 +274,7 @@ cbfs-files-processor-vsa= \ # arg2: output cbfs-files-processor-defconfig= \ $(eval $(2): $(1) $(obj)/build.h; \ - printf " CREATE $(2) (from $(1))\n"; \ + +printf " CREATE $(2) (from $(1))\n"; \ printf "\# This image was built using coreboot " > $(2).tmp && \ grep "\" $(obj)/build.h |cut -d\" -f2 >> $(2).tmp && \ $(MAKE) DOTCONFIG=$(1) DEFCONFIG=$(2).tmp2 savedefconfig && \ @@ -486,7 +486,7 @@ $(ROMCC_BIN): $(top)/util/romcc/romcc.c IFDTOOL:=$(objutil)/ifdtool/ifdtool $(IFDTOOL): @printf " Compile IFDTOOL\n" - $(MAKE) -C $(top)/util/ifdtool + +$(MAKE) -C $(top)/util/ifdtool cp -a $(top)/util/ifdtool/ifdtool $@ IFDFAKE:=$(objutil)/ifdfake/ifdfake diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 78ea427cf3..c6c0280b27 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -172,8 +172,8 @@ BL31_LDFLAGS := --emit-relocs BL31 := $(obj)/bl31.elf $(BL31): $(obj)/build.h - @printf " MAKE $(subst $(obj)/,,$(@))\n" - CROSS_COMPILE="$(CROSS_COMPILE_arm64)" \ + printf " MAKE $(subst $(obj)/,,$(@))\n" + +CROSS_COMPILE="$(CROSS_COMPILE_arm64)" \ CFLAGS="$(BL31_CFLAGS)" \ LDFLAGS="$(BL31_LDFLAGS)" \ $(MAKE) -C $(BL31_SOURCE) $(BL31_MAKEARGS) $(BL31_TARGET) diff --git a/src/vboot/Makefile.inc b/src/vboot/Makefile.inc index c03d639b26..fb373c3aad 100644 --- a/src/vboot/Makefile.inc +++ b/src/vboot/Makefile.inc @@ -95,8 +95,8 @@ VBOOT_CFLAGS += -I$(abspath $(obj)) -include $(top)/src/include/kconfig.h -Wno-m VBOOT_CFLAGS += -DVBOOT_DEBUG $(VB2_LIB): $(obj)/config.h - @printf " MAKE $(subst $(obj)/,,$(@))\n" - $(Q)FIRMWARE_ARCH=$(VB_FIRMWARE_ARCH) \ + printf " MAKE $(subst $(obj)/,,$(@))\n" + +FIRMWARE_ARCH=$(VB_FIRMWARE_ARCH) \ CC="$(CC_verstage)" \ CFLAGS="$(VBOOT_CFLAGS)" VBOOT2="y" \ $(MAKE) -C $(VBOOT_SOURCE) \