Use partitions configuration from the qcom-ptool repo (#949)

We currently have two sources of partition information: qcom-ptool repo
and a set of partition.conf files in meta-qcom. Remove the duplication
by using the data from the qcom-ptool repo.

Closes #714

Author: lumag

classes-recipe/image_types_qcom.bbclass

@@ -5,6 +5,8 @@ inherit image_types
 
 IMAGE_TYPES += "qcomflash"
 
+QCOM_BOOT_FIRMWARE ?= ""
+
 QCOM_ESP_IMAGE ?= "esp-qcom-image"
 QCOM_ESP_FILE ?= "${@'efi.bin' if d.getVar('QCOM_ESP_IMAGE') else ''}"
 
@@ -19,8 +21,9 @@ 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 ?= ""
+QCOM_PARTITION_CONF ?= "qcom-partition-conf"
 
 QCOM_ROOTFS_FILE ?= "rootfs.img"
 IMAGE_QCOMFLASH_FS_TYPE ??= "ext4"
@@ -30,6 +33,7 @@ IMAGE_CMD:qcomflash = "create_qcomflash_pkg"
 do_image_qcomflash[dirs] = "${QCOMFLASH_DIR}"
 do_image_qcomflash[cleandirs] = "${QCOMFLASH_DIR}"
 do_image_qcomflash[depends] += "${@ ['', '${QCOM_PARTITION_CONF}:do_deploy'][d.getVar('QCOM_PARTITION_CONF') != '']} \
+                                ${@ ['', '${QCOM_BOOT_FIRMWARE}:do_deploy'][d.getVar('QCOM_BOOT_FIRMWARE') != '']} \
                                 virtual/kernel:do_deploy \
 				${@'virtual/bootloader:do_deploy' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader') else  ''} \
 				${@'${QCOM_ESP_IMAGE}:do_image_complete' if d.getVar('QCOM_ESP_IMAGE') != '' else  ''}"
@@ -74,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
@@ -94,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
 

conf/machine/include/qcom-qcm2290.inc

@@ -18,5 +18,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
-
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qrb2210-rb1"

conf/machine/include/qcom-qcs6490.inc

@@ -15,5 +15,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
-
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490"

conf/machine/include/qcom-qcs8300.inc

@@ -15,5 +15,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
-
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs8300"

conf/machine/include/qcom-qcs9100.inc

@@ -15,5 +15,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
-
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs9100"

conf/machine/qcm6490-idp.conf

@@ -15,6 +15,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     packagegroup-rb3gen2-hexagon-dsp-binaries \
 "
 
+QCOM_BOOT_FILES_SUBDIR = "qcm6490"
+
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"
+QCOM_PARTITION_FILES_SUBDIR = "partitions/qcm6490-idp"
+
 #
 # Configuration variables for linux-qcom-staging kernel
 #

conf/machine/qcs615-adp-air.conf

@@ -13,4 +13,4 @@ KERNEL_DEVICETREE ?= " \
                       "
 
 QCOM_BOOT_FILES_SUBDIR = "qcs615"
-QCOM_PARTITION_CONF = "qcom-partition-conf-qcs615-adp-air"
+QCOM_PARTITION_FILES_SUBDIR = "partitions/qcs615-adp-air"

conf/machine/qcs6490-rb3gen2-core-kit.conf

@@ -20,7 +20,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_core_kit"
 QCOM_BOOT_FILES_SUBDIR = "qcm6490"
-QCOM_PARTITION_CONF = "qcom-partition-conf-qcs6490-rb3gen2"
+QCOM_PARTITION_FILES_SUBDIR = "partitions/qcs6490-rb3gen2"
+
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"
 
 #
 # Configuration variables for linux-qcom-staging kernel

conf/machine/qcs8300-ride-sx.conf

@@ -19,7 +19,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_ride_sx"
 QCOM_BOOT_FILES_SUBDIR = "qcs8300"
-QCOM_PARTITION_CONF = "qcom-partition-conf-qcs8300-ride-sx"
+QCOM_PARTITION_FILES_SUBDIR = "partitions/qcs8300-ride-sx"
+
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs8300"
 
 #
 # Configuration variables for linux-qcom-staging kernel

conf/machine/qcs9075-iq-9075-evk.conf

@@ -19,7 +19,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_rb8_core_kit"
 QCOM_BOOT_FILES_SUBDIR = "qcs9100"
-QCOM_PARTITION_CONF = "qcom-partition-conf-qcs9100-ride-sx"
+
+# FIXME provide device-specific table
+QCOM_PARTITION_FILES_SUBDIR = "partitions/qcs9100-ride-sx"
+
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs9100"
 
 #
 # Configuration variables for linux-qcom-staging kernel