diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-common.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-common.inc
index 2c26ca1e1..9081e3e88 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-common.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-common.inc
@@ -1,7 +1,6 @@
 # Install NHLOS boot binaries in DEPLOY_DIR
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}/${BOOTBINARIES}"
 
 QCOM_BOOT_IMG_SUBDIR ?= ""
 
@@ -14,13 +13,13 @@ inherit deploy
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR}
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name 'gpt_*.bin' -delete
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name 'zeros_*.bin' -delete
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name '*.bin' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name '*.elf' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name '*.fv' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name '*.mbn' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
-    find "${UNPACKDIR}/${BOOTBINARIES}" -maxdepth 1 -name '*.melf' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
+    find "${S}" -maxdepth 1 -name 'gpt_*.bin' -delete
+    find "${S}" -maxdepth 1 -name 'zeros_*.bin' -delete
+    find "${S}" -maxdepth 1 -name '*.bin' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
+    find "${S}" -maxdepth 1 -name '*.elf' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
+    find "${S}" -maxdepth 1 -name '*.fv' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
+    find "${S}" -maxdepth 1 -name '*.mbn' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
+    find "${S}" -maxdepth 1 -name '*.melf' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
 
     find "${UNPACKDIR}" -name 'cdt*bin' -exec install -m 0644 {} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR} \;
 }
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c-sdcard_17.09.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c-sdcard_17.09.bb
index b2df486e3..eae5a8011 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c-sdcard_17.09.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c-sdcard_17.09.bb
@@ -7,7 +7,7 @@ SRC_URI = "https://releases.linaro.org/96boards/dragonboard410c/linaro/rescue/17
 SRC_URI[md5sum] = "e15da2a623442d66587aea506599fb69"
 SRC_URI[sha256sum] = "9885f915ebd4986432340cf1d03b8fd2bfdd97ad6a4a7466200fddbe41cdcf5c"
 
-BOOTBINARIES = ""
+BOOTBINARIES = "."
 
 QCOM_BOOT_IMG_SUBDIR = "dragonboard410c"
 
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc
new file mode 100644
index 000000000..a1ce280a1
--- /dev/null
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm Robotics RB3Gen2 platform"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
+
+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"
+BOOTBINARIES = "QCM6490_bootbinaries"
+
+SRC_URI = " \
+    https://${FW_ARTIFACTORY}/${FW_BUILD_ID}/${FW_BIN_PATH}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
+    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS6490/cdt/rb3gen2-core-kit.zip;downloadfilename=cdt-rb3gen2-core-kit_${PV}.zip;name=rb3gen2-core-kit \
+    "
+SRC_URI[rb3gen2-core-kit.sha256sum] = "0fe1c0b4050cf54203203812b2c1f0d9698823d8defc8b6516414a4e5e0c557e"
+
+QCOM_BOOT_IMG_SUBDIR = "qcm6490"
+
+include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490_00075.0.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490_00075.0.bb
index b35050004..ee6a3b18d 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490_00075.0.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490_00075.0.bb
@@ -1,19 +1,3 @@
-DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm Robotics RB3Gen2 platform"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
+require recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc
 
-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"
-BOOTBINARIES = "QCM6490_bootbinaries"
-
-SRC_URI = " \
-    https://${FW_ARTIFACTORY}/${FW_BUILD_ID}/${FW_BIN_PATH}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
-    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS6490/cdt/rb3gen2-core-kit.zip;downloadfilename=cdt-rb3gen2-core-kit_${PV}.zip;name=rb3gen2-core-kit \
-    "
 SRC_URI[bootbinaries.sha256sum] = "38e6f424e02a8f99b9edf953e9d62b02489cb936426c58c48daf399ec6d5b60c"
-SRC_URI[rb3gen2-core-kit.sha256sum] = "0fe1c0b4050cf54203203812b2c1f0d9698823d8defc8b6516414a4e5e0c557e"
-
-QCOM_BOOT_IMG_SUBDIR = "qcm6490"
-
-include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc
new file mode 100644
index 000000000..bfbb5d765
--- /dev/null
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS8300 platform"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
+
+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}/qcs8300-le-1-0"
+FW_BIN_PATH = "common/build/ufs/bin"
+BOOTBINARIES = "QCS8300_bootbinaries"
+
+SRC_URI = " \
+    https://${FW_ARTIFACTORY}/${FW_BUILD_ID}/${FW_BIN_PATH}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
+    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS8300/cdt/ride-sx.zip;downloadfilename=cdt-qcs8300-ride-sx_${PV}.zip;name=qcs8300-ride-sx \
+    "
+SRC_URI[qcs8300-ride-sx.sha256sum] = "d7fc667372b28383a36d586333097d84b9d9c104f4dd1845d33904e2d6b39f80"
+
+QCOM_BOOT_IMG_SUBDIR = "qcs8300"
+
+include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300_00075.0.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300_00075.0.bb
index ba510e539..65ff1faf8 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300_00075.0.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300_00075.0.bb
@@ -1,19 +1,3 @@
-DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS8300 platform"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
+require firmware-qcom-boot-qcs8300.inc
 
-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}/qcs8300-le-1-0"
-FW_BIN_PATH = "common/build/ufs/bin"
-BOOTBINARIES = "QCS8300_bootbinaries"
-
-SRC_URI = " \
-    https://${FW_ARTIFACTORY}/${FW_BUILD_ID}/${FW_BIN_PATH}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
-    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS8300/cdt/ride-sx.zip;downloadfilename=cdt-qcs8300-ride-sx_${PV}.zip;name=qcs8300-ride-sx \
-    "
 SRC_URI[bootbinaries.sha256sum] = "826599d4ef60337f38de935f3049134489e3f703b874dd592996b013f8e9e40a"
-SRC_URI[qcs8300-ride-sx.sha256sum] = "d7fc667372b28383a36d586333097d84b9d9c104f4dd1845d33904e2d6b39f80"
-
-QCOM_BOOT_IMG_SUBDIR = "qcs8300"
-
-include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc
new file mode 100644
index 000000000..99ea5d886
--- /dev/null
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc
@@ -0,0 +1,31 @@
+DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS9100 platform"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
+
+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}/qcs9100-le-1-0"
+FW_BIN_PATH = "common/build/ufs/bin"
+BOOTBINARIES = "QCS9100_bootbinaries"
+
+SRC_URI = " \
+    https://${FW_ARTIFACTORY}/${FW_BUILD_ID}/${FW_BIN_PATH}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
+    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS9100/cdt/ride-sx_v3.zip;downloadfilename=cdt-qcs9100-ride-sx-v3_${PV}.zip;name=qcs9100-ride-sx \
+    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS9100/cdt/rb8_core_kit.zip;downloadfilename=cdt-qcs9100-rb8-core-kit_${PV}.zip;name=qcs9100-rb8-ck \
+    "
+SRC_URI[qcs9100-rb8-ck.sha256sum] = "a252244f800d7c9e15883e12935af4113f9f2ecba6490e46cd9b943169f15bfa"
+SRC_URI[qcs9100-ride-sx.sha256sum] = "377a8405899ac82199deaf70bca3648c15b924a3fcef8f109555e661ed70f4b9"
+
+QCOM_BOOT_IMG_SUBDIR = "qcs9100"
+
+include firmware-qcom-boot-common.inc
+
+do_deploy:append() {
+    if [ -d "${UNPACKDIR}/${BOOTBINARIES}/sail_nor" ]; then
+        SAIL_FILES="gpt_backup0.bin gpt_main0.bin prog_firehose_ddr.elf patch0.xml rawprogram0.xml sailfreertos.elf"
+
+        install -d ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR}/sail_nor
+        for sail_file in ${SAIL_FILES}; do
+            install -m 0644 ${UNPACKDIR}/${BOOTBINARIES}/sail_nor/${sail_file} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR}/sail_nor
+        done
+    fi
+}
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100_00075.0.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100_00075.0.bb
index 0bca2be57..221baa707 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100_00075.0.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100_00075.0.bb
@@ -1,32 +1,3 @@
-DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS9100 platform"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/Qualcomm-Technologies-Inc.-Proprietary;md5=58d50a3d36f27f1a1e6089308a49b403"
+require firmware-qcom-boot-qcs9100.inc
 
-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}/qcs9100-le-1-0"
-FW_BIN_PATH = "common/build/ufs/bin"
-BOOTBINARIES = "QCS9100_bootbinaries"
-
-SRC_URI = " \
-    https://${FW_ARTIFACTORY}/${FW_BUILD_ID}/${FW_BIN_PATH}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
-    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS9100/cdt/ride-sx_v3.zip;downloadfilename=cdt-qcs9100-ride-sx-v3_${PV}.zip;name=qcs9100-ride-sx \
-    https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS9100/cdt/rb8_core_kit.zip;downloadfilename=cdt-qcs9100-rb8-core-kit_${PV}.zip;name=qcs9100-rb8-ck \
-    "
 SRC_URI[bootbinaries.sha256sum] = "c8042ef4668761f75021886b931d678339ca9cbab936a20f951a6ba747a77303"
-SRC_URI[qcs9100-rb8-ck.sha256sum] = "a252244f800d7c9e15883e12935af4113f9f2ecba6490e46cd9b943169f15bfa"
-SRC_URI[qcs9100-ride-sx.sha256sum] = "377a8405899ac82199deaf70bca3648c15b924a3fcef8f109555e661ed70f4b9"
-
-QCOM_BOOT_IMG_SUBDIR = "qcs9100"
-
-include firmware-qcom-boot-common.inc
-
-do_deploy:append() {
-    if [ -d "${UNPACKDIR}/${BOOTBINARIES}/sail_nor" ]; then
-        SAIL_FILES="gpt_backup0.bin gpt_main0.bin prog_firehose_ddr.elf patch0.xml rawprogram0.xml sailfreertos.elf"
-
-        install -d ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR}/sail_nor
-        for sail_file in ${SAIL_FILES}; do
-            install -m 0644 ${UNPACKDIR}/${BOOTBINARIES}/sail_nor/${sail_file} ${DEPLOYDIR}/${QCOM_BOOT_IMG_SUBDIR}/sail_nor
-        done
-    fi
-}
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb
index 924f7eb0e..b10a44616 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Prebuilt bootlader images for Qualcomm RB1"
 
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/LICENSE;md5=cbbe399f2c983ad51768f4561587f000"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbe399f2c983ad51768f4561587f000"
 
 SRC_URI = "https://releases.linaro.org/96boards/rb1/linaro/rescue/23.12/rb1-bootloader-emmc-linux-47528.zip"
 SRC_URI[sha256sum] = "c75b6c63eb24c8ca36dad08ba4d4e93f3f4cd7dce60cf1b6dfb5790dc181cc3d"
diff --git a/recipes-bsp/firmware/firmware-qcom.inc b/recipes-bsp/firmware/firmware-qcom.inc
index 9653fb109..a557c0229 100644
--- a/recipes-bsp/firmware/firmware-qcom.inc
+++ b/recipes-bsp/firmware/firmware-qcom.inc
@@ -12,9 +12,6 @@ FW_QCOM_SUBDIR ?= "${FW_QCOM_NAME}"
 FW_QCOM_BASE_PATH = "${nonarch_base_libdir}/firmware/qcom"
 FW_QCOM_PATH = "${FW_QCOM_BASE_PATH}/${FW_QCOM_SUBDIR}"
 
-DSP_QCOM_BASE_PATH = "${datadir}/qcom"
-DSP_QCOM_PATH = "${DSP_QCOM_BASE_PATH}/${FW_QCOM_SUBDIR}"
-
 SPLIT_FIRMWARE_PACKAGES ?= ""
 
 PACKAGE_BEFORE_PN += "${SPLIT_FIRMWARE_PACKAGES}"
@@ -25,9 +22,10 @@ RRECOMMENDS:${PN} += "${@ ' '.join(filter(lambda p: not p.endswith('-split'), d.
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-adreno = "${FW_QCOM_PATH}/*_zap.mbn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio = "${FW_QCOM_PATH}/adsp.mbn ${FW_QCOM_PATH}/adsp_dtb.mbn ${FW_QCOM_PATH}/adsp*.jsn ${FW_QCOM_PATH}/battmgr.jsn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio-split = "${FW_QCOM_PATH}/adsp.mdt ${FW_QCOM_PATH}/adsp.b*"
-FILES:linux-firmware-qcom-${FW_QCOM_NAME}-compute = "${FW_QCOM_PATH}/cdsp.mbn ${FW_QCOM_PATH}/cdsp_dtb.mbn ${FW_QCOM_PATH}/cdsp*.jsn"
+FILES:linux-firmware-qcom-${FW_QCOM_NAME}-compute = "${FW_QCOM_PATH}/cdsp*.mbn ${FW_QCOM_PATH}/cdsp_dtb.mbn ${FW_QCOM_PATH}/cdsp*.jsn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-compute-split = "${FW_QCOM_PATH}/cdsp.mdt ${FW_QCOM_PATH}/cdsp.b*"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-dsps = "${FW_QCOM_PATH}/dsps.mbn"
+FILES:linux-firmware-qcom-${FW_QCOM_NAME}-generalpurpose = "${FW_QCOM_PATH}/gpdsp*.mbn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-gss = "${FW_QCOM_PATH}/gss.mbn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-ipa = "${FW_QCOM_PATH}/ipa_fws.mbn ${FW_QCOM_PATH}/ipa_fws.elf"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-modem = "${FW_QCOM_PATH}/mba.mbn ${FW_QCOM_PATH}/modem.mbn ${FW_QCOM_PATH}/modem*.jsn"