qcom-qcs6490: migrate EXTRA_IMAGEDEPS to QCOM_BOOT_FIRMWARE

lumag · lumag · commit 921e235ae2ca · 2025-07-02T18:09:42.000+03:00
Update machine configuration to use QCOM_BOOT_FIRMWARE in order to
fulfill image_type_qcomflash dependencies at a correct time.

Signed-off-by: Dmitry Baryshkov &lt;dmitry.baryshkov@oss.qualcomm.com&gt;
diff --git a/conf/machine/include/qcom-qcs6490.inc b/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"
diff --git a/conf/machine/qcm6490-idp.conf b/conf/machine/qcm6490-idp.conf
@@ -15,6 +15,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     packagegroup-rb3gen2-hexagon-dsp-binaries \
 "
 
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"
+
 #
 # Configuration variables for linux-qcom-staging kernel
 #
diff --git a/conf/machine/qcs6490-rb3gen2-core-kit.conf b/conf/machine/qcs6490-rb3gen2-core-kit.conf
@@ -22,6 +22,8 @@ QCOM_CDT_FILE = "cdt_core_kit"
 QCOM_BOOT_FILES_SUBDIR = "qcm6490"
 QCOM_PARTITION_CONF = "qcom-partition-conf-qcs6490-rb3gen2"
 
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"
+
 #
 # Configuration variables for linux-qcom-staging kernel
 #

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \`
`15`	`15`	`MACHINE_EXTRA_RRECOMMENDS += " \`
`16`	`16`	`packagegroup-qcom-boot-additional \`
`17`	`17`	`"`
`18`		`-`
`19`		`-EXTRA_IMAGEDEPENDS += "firmware-qcom-boot-qcs6490"`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \`
`15`	`15`	`packagegroup-rb3gen2-hexagon-dsp-binaries \`
`16`	`16`	`"`
`17`	`17`
	`18`	`+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"`
	`19`	`+`
`18`	`20`	`#`
`19`	`21`	`# Configuration variables for linux-qcom-staging kernel`
`20`	`22`	`#`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ QCOM_CDT_FILE = "cdt_core_kit"`
`22`	`22`	`QCOM_BOOT_FILES_SUBDIR = "qcm6490"`
`23`	`23`	`QCOM_PARTITION_CONF = "qcom-partition-conf-qcs6490-rb3gen2"`
`24`	`24`
	`25`	`+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"`
	`26`	`+`
`25`	`27`	`#`
`26`	`28`	`# Configuration variables for linux-qcom-staging kernel`
`27`	`29`	`#`