qcom-partition-confs: split to per-machine recipes

In order to support accessing partition data from generic machine
builds, partition config should not be machine-specific. Split the
single qcom-partition-confs recipe into per-machine recipes.

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

Author: lumag

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

@@ -20,4 +20,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_core_kit"
 QCOM_BOOT_FILES_SUBDIR = "qcm6490"
-QCOM_PARTITION_CONF = "qcom-partition-confs"
+QCOM_PARTITION_CONF = "qcom-partition-conf-qcs6490-rb3gen2"

conf/machine/qcs9100-ride-sx.conf

@@ -22,4 +22,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_ride_sx"
 QCOM_BOOT_FILES_SUBDIR = "qcs9100"
-QCOM_PARTITION_CONF = "qcom-partition-confs"
+QCOM_PARTITION_CONF = "qcom-partition-conf-qcs9100-ride-sx"

conf/machine/qrb2210-rb1-core-kit.conf

@@ -23,4 +23,4 @@ KERNEL_CLASSES += "linux-qcom-bootimg"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "qbootctl"
 
 QCOM_BOOT_FILES_SUBDIR = "qrb2210"
-QCOM_PARTITION_CONF = "qcom-partition-confs"
+QCOM_PARTITION_CONF = "qcom-partition-conf-qrb2210-rb1"

recipes-bsp/partition/qcom-partition-confs/qcm2290-partitions.conf renamed to recipes-bsp/partition/files/qcm2290-partitions.conf

@@ -0,0 +1,7 @@
+MACHINE_DESC = "Qualcomm RB3 Gen2"
+
+PARTCONF = "qcm6490-partitions.conf"
+
+QCOM_PARTCONF_SUBDIR = "qcm6490"
+
+include qcom-partition-conf.inc

recipes-bsp/partition/qcom-partition-confs/qcm6490-partitions.conf renamed to recipes-bsp/partition/files/qcm6490-partitions.conf

@@ -0,0 +1,7 @@
+MACHINE_DESC = "Qualcomm QCS9100 Ride SX"
+
+PARTCONF = "qcs9100-partitions.conf"
+
+QCOM_PARTCONF_SUBDIR = "qcs9100"
+
+include qcom-partition-conf.inc

recipes-bsp/partition/qcom-partition-confs/qcs9100-partitions.conf renamed to recipes-bsp/partition/files/qcs9100-partitions.conf

@@ -0,0 +1,7 @@
+MACHINE_DESC = "Qualcomm RB1"
+
+PARTCONF = "qcm2290-partitions.conf"
+
+QCOM_PARTCONF_SUBDIR = "qrb2210"
+
+include qcom-partition-conf.inc

recipes-bsp/partition/qcom-partition-conf-qcs6490-rb3gen2.bb

@@ -1,37 +1,25 @@
-SUMMARY = "Qualcomm machine specific partition configuration"
-DESCRIPTION = "GPT partition binaries and QDL scripts for supported machines."
+SUMMARY = "Partition configuration for ${MACHINE_DESC}"
+DESCRIPTION = "GPT partition binaries and QDL scripts for ${MACHINE_DESC}."
 LICENSE = "BSD-3-Clause-Clear"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause-Clear;md5=7a434440b651f4a472ca93716d01033a"
 
 DEPENDS += "qcom-gen-partitions-tool-native qcom-ptool-native"
 
-SRC_URI = " \
-    file://qcm6490-partitions.conf \
-    file://qcs9100-partitions.conf \
-    file://qcm2290-partitions.conf \
-"
+SRC_URI = "file://${PARTCONF}"
 
 S = "${WORKDIR}/sources"
 UNPACKDIR = "${S}"
 B = "${WORKDIR}/build"
 
 inherit python3native deploy
 
+inherit allarch
+
 INHIBIT_DEFAULT_DEPS = "1"
 
 do_configure[noexec] = "1"
 do_install[noexec] = "1"
 
-QCOM_PARTCONF_SUBDIR ?= ""
-QCOM_PARTCONF_SUBDIR:qcm6490 ?= "qcm6490"
-QCOM_PARTCONF_SUBDIR:qcs9100 ?= "qcs9100"
-QCOM_PARTCONF_SUBDIR:qcm2290 ?= "qrb2210"
-
-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}/partition.xml
     ptool.py -x ${B}/partition.xml
@@ -49,6 +37,3 @@ do_deploy() {
     install -m 0644 ${B}/wipe_rawprogram_PHY*.xml -D ${DEPLOYDIR}/${QCOM_PARTCONF_SUBDIR}
 }
 addtask deploy before do_build after do_compile
-
-COMPATIBLE_MACHINE = "(qcm6490|qcs9100|qcm2290)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"