From 4973d8b68108e98ff57fb1b19b70c9a3f049fc37 Mon Sep 17 00:00:00 2001
From: Piotr Kubik <piotr.kubik@iopsys.eu>
Date: Wed, 23 Oct 2024 16:16:49 +0200
Subject: [PATCH] treewide: iowrt-kernel-fit-gen-its - use $IMAGE_KERNEL
 instead of $@

This allows to use 'iowrt-kernel-fit-gen-its' for targets other
than kernel e.g. FITBLK creation at for sysupgrade.
---
 iopsys-common/iopsys-fit-image.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/iopsys-common/iopsys-fit-image.mk b/iopsys-common/iopsys-fit-image.mk
index 0331b138b..0df1c316d 100644
--- a/iopsys-common/iopsys-fit-image.mk
+++ b/iopsys-common/iopsys-fit-image.mk
@@ -233,7 +233,7 @@ define iopsys-filter-uboot-env
 endef
 
 define iowrt-kernel-fit-gen-its
-	$(if $(findstring with-u-boot-ram,$(word 2,$(1))), lzma e $@-u-boot-ram.bin $@-u-boot-ram.lzma)
+	$(if $(findstring with-u-boot-ram,$(word 2,$(1))), lzma e $(IMAGE_KERNEL)-u-boot-ram.bin $(IMAGE_KERNEL)-u-boot-ram.lzma)
 	$(if $(findstring squashfs-encrypt,$(KERNEL)), $(call sfdt))
 	$(call generate-version-dtbo,$(addsuffix -image-version,$@))
 	$(call generate-iowrt-kernel-fit-extra, $@_iowrt_kernel_fit_extra.dtsi)
@@ -243,7 +243,7 @@ define iowrt-kernel-fit-gen-its
 		-v $(LINUX_VERSION) \
 		-D $(DEVICE_NAME) \
 		-o $@.its \
-		-k $@ \
+		-k $(IMAGE_KERNEL) \
 		-C $(word 1,$(1)) \
 		$(if $(word 2,$(1)),\
 			$(if $(findstring 11, $(if $(DEVICE_DTS_OVERLAY),1)$(if $(findstring $(KERNEL_BUILD_DIR)/image-,$(word 2,$(1))),,1)), \
@@ -262,7 +262,7 @@ define iowrt-kernel-fit-gen-its
 			$(DEVICE_NAME),image)-$(dts).dtb))) \
 		$(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtbo)) \
 		$(if $(findstring with-u-boot-ram,$(word 2,$(1))), \
-			-R $@-u-boot-ram.lzma \
+			-R $(IMAGE_KERNEL)-u-boot-ram.lzma \
 			$(if $(UBOOT_RAM_COMPRESSION), -P $(UBOOT_RAM_COMPRESSION)) \
 			$(if $(UBOOT_RAM_LOADADDR), -U $(UBOOT_RAM_LOADADDR))) \
 		$(if $(call qstrip,$(SECURE_BOOT_FITPK)),-S $(call absolute_path, $(SECURE_BOOT_KEY_DIR)/$(SECURE_BOOT_FITPK))) \
-- 
GitLab