image: fix append-image when building multiple profiles

In case CONFIG_TARGET_MULTI_PROFILE is set, IMG_PREFIX cannot be
expanded. Use DEVICE_IMG_PREFIX instead and make sure it's defined.

Fixes: 8f89b1ab0f ("image: add 'append-image' build command")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/include/image-commands.mk b/include/image-commands.mk
index ec4f9624f54c99adfcf064d0ffc3adf57ae07bf5..2c56ed8d1dafbebbb19ff5a2b1c535280f238ef7 100644 (file)
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -28,7 +28,7 @@ define Build/append-kernel
 endef
 
 define Build/append-image
-       dd if=$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-$(1) >> $@
+       dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) >> $@
 endef
 
 compat_version=$(if $(DEVICE_COMPAT_VERSION),$(DEVICE_COMPAT_VERSION),1.0)

diff --git a/include/image.mk b/include/image.mk
index 8b7b2b97405ad62b6e962faf697aff3ee1027125..76c527a15eab9453dcae5c36025bc78dc25f3b8d 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -419,7 +419,7 @@ DEFAULT_DEVICE_VARS := \
   CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
   VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
   DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_DTS_OVERLAY DEVICE_FDT_NUM \
-  SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \
+  DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \
   SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
   UBOOT_PATH IMAGE_SIZE \
   DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \