mk: Introduce KERNEL_MAKE variable

This combines the typical kernel make call idiom into a single variable
reference. A side-effect is that parallel make is enabled (via added
'-j' flag) in many cases, but that shouldn't cause harm.

Signed-off-by: Phil Sutter <phil@nwl.cc>

4 files changed, 18 insertions, 34 deletions

diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile
index c96264c39..b470e2975 100644
--- a/target/aarch64/Makefile
+++ b/target/aarch64/Makefile
@@ -63,8 +63,7 @@ kernel-install: kernel-strip
 
 dtb-install:
 ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		dtbs $(MAKE_TRACE)
+	${KERNEL_MAKE} dtbs $(MAKE_TRACE)
 	mkdir -p $(FW_DIR)/overlays
 	for x in $(LINUX_DIR)/arch/arm64/boot/dts/overlays/*.dtbo; do \
 		[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm64/boot/dts/overlays/*.dtbo $(FW_DIR)/overlays; \
diff --git a/target/arm/Makefile b/target/arm/Makefile
index fe3fee720..d92e10d6a 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -170,39 +170,31 @@ endif
 
 dtb-install:
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		dtbs $(MAKE_TRACE)
+	${KERNEL_MAKE} dtbs $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		vexpress-v2p-ca9.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} vexpress-v2p-ca9.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		versatile-pb.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} versatile-pb.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_WEGA),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		am335x-wega-rdk.dtb
+	${KERNEL_MAKE} am335x-wega-rdk.dtb $(MAKE_TRACE)
 	cp $(LINUX_DIR)/arch/arm/boot/dts/am335x-wega-rdk.dtb ${TARGET_DIR}/boot
 endif
 ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
- 		imx6q-phytec-pbab01.dtb
+	${KERNEL_MAKE} imx6q-phytec-pbab01.dtb $(MAKE_TRACE)
 	cp $(LINUX_DIR)/arch/arm/boot/dts/imx6q-phytec-pbab01.dtb ${TARGET_DIR}/boot
 endif
 ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		am335x-boneblack.dtb
+	${KERNEL_MAKE} am335x-boneblack.dtb $(MAKE_TRACE)
 	cp $(LINUX_DIR)/arch/arm/boot/dts/am335x-boneblack.dtb ${TARGET_DIR}/boot
 endif
 ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		dtbs $(MAKE_TRACE)
+	${KERNEL_MAKE} dtbs $(MAKE_TRACE)
 	mkdir -p $(FW_DIR)/overlays
 	for x in $(LINUX_DIR)/arch/arm/boot/dts/overlays/*.dtbo; do \
 		[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/overlays/*.dtbo $(FW_DIR)/overlays; \
@@ -210,28 +202,23 @@ ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
 	done
 endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		sun7i-a20-bananapro.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} sun7i-a20-bananapro.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \
+		imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		armada-388-clearfog.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F429),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		dtbs $(MAKE_TRACE)
+	${KERNEL_MAKE} dtbs $(MAKE_TRACE)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F769),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		dtbs $(MAKE_TRACE)
+	${KERNEL_MAKE} dtbs $(MAKE_TRACE)
 endif
 	for x in $(LINUX_DIR)/arch/arm/boot/dts/*.dtb; do \
 		[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/*.dtb $(FW_DIR); \
diff --git a/target/nios2/Makefile b/target/nios2/Makefile
index ca418392d..8f08701df 100644
--- a/target/nios2/Makefile
+++ b/target/nios2/Makefile
@@ -59,8 +59,7 @@ kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
 dtb-install:
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		10m50_devboard.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} 10m50_devboard.dtb $(MAKE_TRACE)
 	for x in $(LINUX_DIR)/arch/nios2/boot/*.dtb; do \
 		[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/nios2/boot/*.dtb $(FW_DIR); \
 		break; \
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index 2eec72d23..2b143943f 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -74,8 +74,7 @@ kernel-install: kernel-strip
 
 dtb-install:
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507),y)
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
-		-j${ADK_MAKE_JOBS} virtex440-ml507.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} virtex440-ml507.dtb $(MAKE_TRACE)
 	$(CP) $(LINUX_DIR)/arch/powerpc/boot/virtex440-ml507.dtb \
 		$(FW_DIR)/ppc.dtb
 endif