image_types_qcom: move qcom-partition-confs to machine config

lumag · lumag · commit fd11163d9bbe · 2025-03-28T13:28:08.000+02:00
Machine's partition configuration can be provided by various recipes
(especially for machines supported outside of the meta-qcom layer). Also
this configuration option is machine-specific rather than being
SoC-specific.

Make machine configs specify the recipe used to provide rawprogramN.xml,
patchN.xml and GPT data.

Signed-off-by: Dmitry Baryshkov &lt;dmitry.baryshkov@oss.qualcomm.com&gt;
diff --git a/classes-recipe/image_types_qcom.bbclass b/classes-recipe/image_types_qcom.bbclass
@@ -17,14 +17,17 @@ QCOM_DTB_FILE ?= "dtb.bin"
 
 QCOM_BOOT_FILES_SUBDIR ?= ""
 
+QCOM_PARTITION_CONF ?= ""
+
 QCOM_ROOTFS_FILE ?= "rootfs.img"
 IMAGE_QCOMFLASH_FS_TYPE ??= "ext4"
 
 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-partition-confs:do_deploy virtual/kernel:do_deploy \
+do_image_qcomflash[depends] += "${@ ['', '${QCOM_PARTITION_CONF}:do_deploy'][d.getVar('QCOM_PARTITION_CONF') != '']} \
+                                virtual/kernel:do_deploy \
 				${@'${QCOM_ESP_IMAGE}:do_image_complete' if d.getVar('QCOM_ESP_IMAGE') != '' else  ''}"
 IMAGE_TYPEDEP:qcomflash += "${IMAGE_QCOMFLASH_FS_TYPE}"
 
diff --git a/conf/machine/include/qcom-qcm2290.inc b/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-partition-confs"
+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qrb2210-rb1"
diff --git a/conf/machine/include/qcom-qcs6490.inc b/conf/machine/include/qcom-qcs6490.inc
@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
 
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490 qcom-partition-confs"
+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490"
diff --git a/conf/machine/include/qcom-qcs9100.inc b/conf/machine/include/qcom-qcs9100.inc
@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     packagegroup-qcom-boot-additional \
 "
 
-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs9100 qcom-partition-confs"
+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs9100"
diff --git a/conf/machine/qcs6490-rb3gen2-core-kit.conf b/conf/machine/qcs6490-rb3gen2-core-kit.conf
@@ -20,3 +20,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_core_kit"
 QCOM_BOOT_FILES_SUBDIR = "qcm6490"
+QCOM_PARTITION_CONF = "qcom-partition-confs"
diff --git a/conf/machine/qcs9100-ride-sx.conf b/conf/machine/qcs9100-ride-sx.conf
@@ -22,3 +22,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 
 QCOM_CDT_FILE = "cdt_ride_sx"
 QCOM_BOOT_FILES_SUBDIR = "qcs9100"
+QCOM_PARTITION_CONF = "qcom-partition-confs"
diff --git a/conf/machine/qrb2210-rb1-core-kit.conf b/conf/machine/qrb2210-rb1-core-kit.conf
@@ -23,3 +23,4 @@ KERNEL_CLASSES += "linux-qcom-bootimg"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "qbootctl"
 
 QCOM_BOOT_FILES_SUBDIR = "qrb2210"
+QCOM_PARTITION_CONF = "qcom-partition-confs"

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \`
`16`	`16`	`packagegroup-qcom-boot-additional \`
`17`	`17`	`"`
`18`	`18`
`19`		`-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qrb2210-rb1 qcom-partition-confs"`
	`19`	`+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qrb2210-rb1"`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS += " \`
`17`	`17`	`packagegroup-qcom-boot-additional \`
`18`	`18`	`"`
`19`	`19`
`20`		`-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490 qcom-partition-confs"`
	`20`	`+EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490"`
Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \`
`20`	`20`
`21`	`21`	`QCOM_CDT_FILE = "cdt_core_kit"`
`22`	`22`	`QCOM_BOOT_FILES_SUBDIR = "qcm6490"`
	`23`	`+QCOM_PARTITION_CONF = "qcom-partition-confs"`
Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \`
`22`	`22`
`23`	`23`	`QCOM_CDT_FILE = "cdt_ride_sx"`
`24`	`24`	`QCOM_BOOT_FILES_SUBDIR = "qcs9100"`
	`25`	`+QCOM_PARTITION_CONF = "qcom-partition-confs"`
Original file line number	Diff line number	Diff line change
`@@ -23,3 +23,4 @@ KERNEL_CLASSES += "linux-qcom-bootimg"`
`23`	`23`	`MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "qbootctl"`
`24`	`24`
`25`	`25`	`QCOM_BOOT_FILES_SUBDIR = "qrb2210"`
	`26`	`+QCOM_PARTITION_CONF = "qcom-partition-confs"`