image-types-qcom: separate subdirs for boot firmware and partitions

We typically have a set of boot files that can be used for several
devices, while partition table is usually more device-specfic. Add
support for specifying separate subdir for partition data.

Signed-off-by: Dmitry Baryshkov <[email protected]>

Author: lumag

classes-recipe/image_types_qcom.bbclass

@@ -21,6 +21,7 @@ QCOM_DTB_DEFAULT ?= "${@os.path.basename(d.getVar('KERNEL_DEVICETREE').split()[0
 QCOM_DTB_FILE ?= "dtb.bin"
 
 QCOM_BOOT_FILES_SUBDIR ?= ""
+QCOM_PARTITION_FILES_SUBDIR ?= "${QCOM_BOOT_FILES_SUBDIR}"
 
 QCOM_PARTITION_CONF ?= ""
 
@@ -77,13 +78,13 @@ create_qcomflash_pkg() {
     install -m 0644 ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_QCOMFLASH_FS_TYPE} ${QCOM_ROOTFS_FILE}
 
     # partition bins
-    for pbin in `find ${DEPLOY_DIR_IMAGE}/${QCOM_BOOT_FILES_SUBDIR} -maxdepth 1 -type f -name 'gpt_main*.bin' \
+    for pbin in `find ${DEPLOY_DIR_IMAGE}/${QCOM_PARTITION_FILES_SUBDIR} -maxdepth 1 -type f -name 'gpt_main*.bin' \
                 -o -name 'gpt_backup*.bin' -o -name 'patch*.xml'`; do
         install -m 0644 ${pbin} .
     done
 
     # skip BLANK_GPT and WIPE_PARTITIONS for rawprogram xml files
-    for rawpg in `find ${DEPLOY_DIR_IMAGE}/${QCOM_BOOT_FILES_SUBDIR} -maxdepth 1 -type f -name 'rawprogram*.xml' \
+    for rawpg in `find ${DEPLOY_DIR_IMAGE}/${QCOM_PARTITION_FILES_SUBDIR} -maxdepth 1 -type f -name 'rawprogram*.xml' \
                 ! -name 'rawprogram*_BLANK_GPT.xml' ! -name 'rawprogram*_WIPE_PARTITIONS.xml'`; do
         install -m 0644 ${rawpg} .
     done
@@ -97,7 +98,7 @@ create_qcomflash_pkg() {
     for logfs in `find ${DEPLOY_DIR_IMAGE}/${QCOM_BOOT_FILES_SUBDIR} -maxdepth 1 -type f -name 'logfs_*.bin'`; do
         install -m 0644 ${logfs} .
     done
-    for zeros in `find ${DEPLOY_DIR_IMAGE}/${QCOM_BOOT_FILES_SUBDIR} -maxdepth 1 -type f -name 'zeros_*.bin'`; do
+    for zeros in `find ${DEPLOY_DIR_IMAGE}/${QCOM_PARTITION_FILES_SUBDIR} -maxdepth 1 -type f -name 'zeros_*.bin'`; do
         install -m 0644 ${zeros} .
     done