image_types_qcom: repurpose QCOM_ESP_FILE to reference custom ESP image

The qcom-ptool partition definitions expect the ESP image to be installed as
efi.bin, so there is no need to support a custom name via QCOM_ESP_FILE.

Repurpose QCOM_ESP_FILE to point to the generated ESP image path instead,
which is then copied as efi.bin. This enables external layers (e.g.
meta-updater) to provide custom ESP images via different file paths.

Signed-off-by: Ricardo Salveti <[email protected]>

Author: ricardosalveti

classes-recipe/image_types_qcom.bbclass

@@ -8,7 +8,7 @@ IMAGE_TYPES += "qcomflash"
 QCOM_BOOT_FIRMWARE ?= ""
 
 QCOM_ESP_IMAGE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "esp-qcom-image", "", d)}"
-QCOM_ESP_FILE ?= "${@'efi.bin' if d.getVar('QCOM_ESP_IMAGE') else ''}"
+QCOM_ESP_FILE ?= "${@'${DEPLOY_DIR_IMAGE}/${QCOM_ESP_IMAGE}-${MACHINE}${IMAGE_NAME_SUFFIX}.vfat' if d.getVar('QCOM_ESP_IMAGE') else ''}"
 
 # There is currently no upstream-compatible way for the firmware to
 # identify and load the correct DTB from a combined-dtb that contains all
@@ -38,9 +38,7 @@ IMAGE_TYPEDEP:qcomflash += "${IMAGE_QCOMFLASH_FS_TYPE}"
 
 create_qcomflash_pkg() {
     # esp image
-    if [ -n "${QCOM_ESP_FILE}" ]; then
-        install -m 0644 ${DEPLOY_DIR_IMAGE}/${QCOM_ESP_IMAGE}-${MACHINE}${IMAGE_NAME_SUFFIX}.vfat ${QCOM_ESP_FILE}
-    fi
+    [ -n "${QCOM_ESP_FILE}" ] && install -m 0644 ${QCOM_ESP_FILE} efi.bin
 
     # dtb image
     if [ -n "${QCOM_DTB_DEFAULT}" ] && \