qcs6490-rb3gen2-core-kit: move all boot-related files to subdir

Move bootloader and QDL files to a subdir under the DEPLOY_DIR in order
to remove conflicts between packages. This also removes a need to limit
the boot image recipe to be usable only on the qcs6490 machines.

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

Author: lumag

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

@@ -19,3 +19,4 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 "
 
 QCOM_CDT_FILE = "cdt_core_kit"
+QCOM_BOOT_FILES_SUBDIR = "qcm6490"

recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490_00058.0.bb

@@ -2,8 +2,6 @@ DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm Robotics RB3Gen2 platform"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
 
-COMPATIBLE_MACHINE = "qcm6490"
-
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/download/software/chip/qualcomm_linux-spf-1-0/qualcomm-linux-spf-1-0_test_device_public"
 FW_BUILD_ID = "r1.0_${PV}/qcm6490-le-1-0"
 FW_BIN_PATH = "common/build/ufs/bin"
@@ -16,4 +14,6 @@ SRC_URI = " \
 SRC_URI[bootbinaries.sha256sum] = "08c0798f1ab9f380c94b54141847c7b365c87f2a072a2461779cf282809aeeb4"
 SRC_URI[rb3gen2-core-kit.sha256sum] = "0fe1c0b4050cf54203203812b2c1f0d9698823d8defc8b6516414a4e5e0c557e"
 
+QCOM_BOOT_IMG_SUBDIR = "qcm6490"
+
 include firmware-qcom-boot-common.inc

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

@@ -23,6 +23,7 @@ do_configure[noexec] = "1"
 do_install[noexec] = "1"
 
 QCOM_PARTCONF_SUBDIR ?= ""
+QCOM_PARTCONF_SUBDIR:qcm6490 ?= "qcm6490"
 
 PARTCONF ?= ""
 PARTCONF:qcm6490 ?= "qcm6490-partitions.conf"