From ff012f3a67eba3622265b2aaf38da6a0a4574021 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Wed, 4 Nov 2020 10:21:13 +0100 Subject: [PATCH] build: uImage: allow override of default arguments For some build recipes, the argument to Build/uImage is used to sneak in extra arguments for mkimage, whereas this appears to have been intended to specificy the compression method only. Use the first provided word for -C to be backwards compatible with current calls to Build/uImage. Use the rest of the call arguments to override the provided defaults. Only the input file name (-d) and the output file name cannot overriden. Signed-off-by: Sander Vanheule --- include/image-commands.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 438f1e87e4..a8faefbcff 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -396,8 +396,9 @@ endef define Build/uImage mkimage -A $(LINUX_KARCH) \ -O linux -T kernel \ - -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' -d $@ $@.new + -C $(word 1,$(1)) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ + -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' \ + $(wordlist 2,$(words $(1)),$(1)) -d $@ $@.new mv $@.new $@ endef -- 2.30.2