qcom-gen-partition-bins: fold into qcom-partition-confs

Fold the generation of GPT data and QDL XML files into the recipe that
provides original partition data. This removes extra step during boot
files generation and simplifies forthcoming changes to generate all
partition binaries at the same time.

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

Author: lumag

classes-recipe/image_types_qcom.bbclass

@@ -22,7 +22,7 @@ QCOMFLASH_DIR = "${IMGDEPLOYDIR}/${IMAGE_NAME}.qcomflash"
 IMAGE_CMD:qcomflash = "create_qcomflash_pkg"
 do_image_qcomflash[dirs] = "${QCOMFLASH_DIR}"
 do_image_qcomflash[cleandirs] = "${QCOMFLASH_DIR}"
-do_image_qcomflash[depends] += "qcom-gen-partition-bins:do_deploy virtual/kernel:do_deploy \
+do_image_qcomflash[depends] += "qcom-partition-confs:do_deploy virtual/kernel:do_deploy \
 				${@'${QCOM_ESP_IMAGE}:do_image_complete' if d.getVar('QCOM_ESP_IMAGE') != '' else  ''}"
 IMAGE_TYPEDEP:qcomflash += "${IMAGE_QCOMFLASH_FS_TYPE}"
 

conf/machine/include/qcom-qcm2290.inc

@@ -16,4 +16,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
 
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qrb2210-rb1 qcom-gen-partition-bins"
+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qrb2210-rb1 qcom-partition-confs"

conf/machine/include/qcom-qcs6490.inc

@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
 
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490 qcom-gen-partition-bins"
+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490 qcom-partition-confs"

conf/machine/include/qcom-qcs9100.inc

@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
 
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs9100 qcom-gen-partition-bins"
+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs9100 qcom-partition-confs"

recipes-bsp/partition/qcom-partition-confs_1.0.bb

@@ -1,19 +1,16 @@
 SUMMARY = "Qualcomm machine specific partition configuration"
-DESCRIPTION = "Machine partition configuration used by qcom-gen-partitions-tool \
-for generating the machine specific partition.xml file."
+DESCRIPTION = "GPT partition binaries and QDL scripts for supported machines."
 LICENSE = "BSD-3-Clause-Clear"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause-Clear;md5=7a434440b651f4a472ca93716d01033a"
 
-DEPENDS += "qcom-gen-partitions-tool-native"
+DEPENDS += "qcom-gen-partitions-tool-native qcom-ptool-native"
 
 SRC_URI = " \
     file://qcm6490-partitions.conf \
     file://qcs9100-partitions.conf \
     file://qcm2290-partitions.conf \
 "
 
-PROVIDES += "virtual/partconf"
-
 S = "${WORKDIR}/sources"
 UNPACKDIR = "${S}"
 B = "${WORKDIR}/build"
@@ -23,24 +20,29 @@ inherit python3native deploy
 INHIBIT_DEFAULT_DEPS = "1"
 
 do_configure[noexec] = "1"
+do_install[noexec] = "1"
 
 PARTCONF ?= ""
 PARTCONF:qcm6490 ?= "qcm6490-partitions.conf"
 PARTCONF:qcs9100 ?= "qcs9100-partitions.conf"
 PARTCONF:qcm2290 ?= "qcm2290-partitions.conf"
 
 do_compile() {
-    gen_partition.py -i ${S}/${PARTCONF} -o ${B}/${MACHINE}-partition.xml
-}
-
-do_install() {
-    install -D -m0644 ${B}/${MACHINE}-partition.xml ${D}${datadir}/qcom-partition-confs/${MACHINE}-partition.xml
+    gen_partition.py -i ${S}/${PARTCONF} -o ${B}/partition.xml
+    ptool.py -x ${B}/partition.xml
 }
 
 do_deploy() {
-    install -m 0644 ${B}/${MACHINE}-partition.xml -D ${DEPLOYDIR}/partition.xml
+    install -m 0644 ${B}/gpt_backup*.bin -D ${DEPLOYDIR}
+    install -m 0644 ${B}/gpt_both*.bin -D ${DEPLOYDIR}
+    install -m 0644 ${B}/gpt_empty*.bin -D ${DEPLOYDIR}
+    install -m 0644 ${B}/gpt_main*.bin -D ${DEPLOYDIR}
+    install -m 0644 ${B}/patch*.xml -D ${DEPLOYDIR}
+    install -m 0644 ${B}/rawprogram*.xml -D ${DEPLOYDIR}
+    install -m 0644 ${B}/zeros_*.bin -D ${DEPLOYDIR}
+    install -m 0644 ${B}/wipe_rawprogram_PHY*.xml -D ${DEPLOYDIR}
 }
-addtask deploy after do_install
+addtask deploy before do_build after do_compile
 
 COMPATIBLE_MACHINE = "(qcm6490|qcs9100|qcm2290)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"