From 49ca968b0bfc44f09203c8be801ac26953ea5a0f Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Fri, 13 Sep 2019 03:59:23 +0200 Subject: [PATCH] payloads/LinuxBoot: move kernel make flags into own variable Change-Id: I9240043d2c15b68aabe154b289a961d8d48d3e5f Signed-off-by: Alexander Couzens Reviewed-on: https://review.coreboot.org/c/coreboot/+/35392 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- payloads/external/LinuxBoot/targets/linux.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk index b7b3a0de94d0..8be0926eb007 100644 --- a/payloads/external/LinuxBoot/targets/linux.mk +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -29,6 +29,8 @@ tarball_dir:=$(project_dir)/tarball decompress_flag=.done OBJCOPY:=$(LINUXBOOT_CROSS_COMPILE)objcopy +KERNEL_MAKE_FLAGS = \ + ARCH=$(ARCH-y) ifeq ($(CONFIG_LINUXBOOT_KERNEL_CUSTOM),y) kernel_version:=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION) @@ -90,15 +92,15 @@ ifeq ($(CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG),y) else cp $(ARCH-y)/defconfig $(kernel_dir)/.config endif - $(MAKE) -C $(kernel_dir) olddefconfig ARCH=$(ARCH-y) + $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) olddefconfig build: $(kernel_dir)/.config @echo " MAKE Linux $(kernel_version)" ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y) - $(MAKE) -C $(kernel_dir) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) ARCH=$(ARCH-y) bzImage + $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) bzImage else ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y) - $(MAKE) -C $(kernel_dir) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) ARCH=$(ARCH-y) vmlinux + $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) vmlinux endif endif