diff --git a/classes-recipe/nhlos-license.bbclass b/classes-recipe/nhlos-license.bbclass
deleted file mode 100644
index 019243e88..000000000
--- a/classes-recipe/nhlos-license.bbclass
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
-#
-# SPDX-License-Identifier: MIT
-#
-# If specified, NHLOS_LICENSE and NHLOS_LICENSE_MD5 specify the licence file
-# (and the checksum) for the NHLOS binaries.
-
-NHLOS_LICENSE ??= ""
-NHLOS_LICENSE_MD5 ??= ""
-
-# LICENSE needs to be set directly as base.bbclass verified it before the
-# anonymous python function has a chance to kick in.
-LICENSE = "${@ 'NHLOS-${BPN}' if d.getVar('NHLOS_LICENSE') else 'CLOSED'}"
-
-def handle_nhlos_license(d, pkgs):
-    if d.getVar("NHLOS_LICENSE"):
-        pn = d.getVar('BPN')
-        d.setVarFlag("NO_GENERIC_LICENSE", f"NHLOS-{pn}", '${NHLOS_LICENSE}')
-        d.appendVar('SRC_URI', ' file://${NHLOS_LICENSE}')
-        d.appendVar('LIC_FILES_CHKSUM', ' file://${NHLOS_LICENSE};md5=${NHLOS_LICENSE_MD5}')
-        d.appendVar('PACKAGE_BEFORE_PN', ' ${PN}-license')
-
-        for pkg in pkgs:
-            # Depend on the main package to get the license file
-            d.appendVar("RDEPENDS:" + pkg, " ${PN}-license")
-
-install_nhlos_license() {
-    if [ -n "${NHLOS_LICENSE}" ] ; then
-        install -d ${D}${datadir}/${BPN}
-        install -m 0644 ${NHLOS_LICENSE} ${D}${datadir}/${BPN}
-    fi
-}
-
-FILES:${PN}-license = "${@ '${datadir}/${BPN}' if d.getVar('NHLOS_LICENSE') else ''}"
diff --git a/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qcom.inc b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qcom.inc
index ae8ac880f..85f7c855e 100644
--- a/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qcom.inc
+++ b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qcom.inc
@@ -8,7 +8,7 @@ SRCREV_FORMAT_qcom:qcm6490 = "_qc-blobs"
 
 SRCREV_FORMAT .= "${SRCREV_FORMAT_qcom}"
 
-LICENSE += "& LICENSE.qcom"
+LICENSE += "AND LicenseRef-LICENSE.qcom"
 LIC_FILES_CHKSUM:qcm6490 += "file://${UNPACKDIR}/qc_blobs/sc7280/qtiseclib/LICENSE;md5=fa83f30385e617b56ef0934f13645621"
 
 COMPATIBLE_MACHINE = "qcm6490|qcs9100"
diff --git a/dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-kodiak_1.0.24.bb b/dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-kodiak_1.0.24.bb
index 9163bdbf9..5a5a02a59 100644
--- a/dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-kodiak_1.0.24.bb
+++ b/dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-kodiak_1.0.24.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "This recipe introduces Qualcomm CamX camera module which creates
    camx: Core CamX engine that manages camera pipelines, mediates between camera clients and hardware, and exposes structured interfaces to higher-level frameworks. \
    chicdk: Camera hardware interface development kit delivering a configurable mechanism for use case selection and camera pipeline topology creation. \
    Includes configurable sensor and tuning binaries, which are essential for enabling full camera functionality."
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0 \
                     file://usr/share/doc/${BPN}/NOTICE;md5=04facc2e07e3d41171a931477be0c690"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-multimedia/camx/common.inc b/dynamic-layers/openembedded-layer/recipes-multimedia/camx/common.inc
index 03fd49888..6ca97ff78 100644
--- a/dynamic-layers/openembedded-layer/recipes-multimedia/camx/common.inc
+++ b/dynamic-layers/openembedded-layer/recipes-multimedia/camx/common.inc
@@ -12,7 +12,7 @@ mechanism for use case selection and camera pipeline topology creation. \
 Includes configurable sensor and tuning binaries, which are essential for enabling \
 full camera functionality."
 
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0 \
                     file://usr/share/doc/${BPN}/NOTICE;md5=198d001f49d9a313355d5219f669a76c"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-security/minkipc/minkipc_1.2.9.bb b/dynamic-layers/openembedded-layer/recipes-security/minkipc/minkipc_1.2.9.bb
index af3db9e34..efb82c634 100644
--- a/dynamic-layers/openembedded-layer/recipes-security/minkipc/minkipc_1.2.9.bb
+++ b/dynamic-layers/openembedded-layer/recipes-security/minkipc/minkipc_1.2.9.bb
@@ -8,7 +8,7 @@ qteesupplicant service is designed for invocation dispatch and handling callback
 HOMEPAGE = "https://github.com/qualcomm/minkipc.git"
 SECTION = "devel"
 
-LICENSE = "BSD-3-Clause & BSD-2-Clause & GPL-2.0-only"
+LICENSE = "BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only"
 
 inherit cmake systemd pkgconfig
 
diff --git a/dynamic-layers/openembedded-layer/recipes-security/qwes/qwes_1.1.bb b/dynamic-layers/openembedded-layer/recipes-security/qwes/qwes_1.1.bb
index 851bfc837..6a919c0bd 100644
--- a/dynamic-layers/openembedded-layer/recipes-security/qwes/qwes_1.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-security/qwes/qwes_1.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Qualcomm Wireless Edge Services provide a suite of features Platf
 device attestation and secure provisioning. This recipe includes the daemon and scripts which setup \
 the store and optionally load QcWES TA to provide these features."
 
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260620"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/sensors/qcom-sensors-binaries_1.2.1.bb b/dynamic-layers/openembedded-layer/recipes-support/sensors/qcom-sensors-binaries_1.2.1.bb
index 163175329..fb0e225b6 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/sensors/qcom-sensors-binaries_1.2.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/sensors/qcom-sensors-binaries_1.2.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "Prebuilt Qualcomm sensors libraries and test applications"
 DESCRIPTION = "Prebuilt core binaries required for sensor enablement and hardware \
 sensor data access. These prebuilt binaries also include test applications to \
 validate sensor services functionality through the Sensinghub Interface."
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://LICENSE.qcom-2;md5=f33ba334514c4dfabc6ab7377babb377"
 
 PBT_BUILD_DATE = "260514.1"
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 cba4608c4..f4572d1b2 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
@@ -1,6 +1,6 @@
 SUMMARY = "Prebuilt bootlader images for Dragonboard 410c"
 
-LICENSE = "LICENSE.qcom"
+LICENSE = "LicenseRef-LICENSE.qcom"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4d087ee0965cb059f1b2f9429e166f64"
 
 SRC_URI = "https://artifacts.codelinaro.org/artifactory/clo-549-96boards-backup/96boards/dragonboard410c/linaro/rescue/17.09/dragonboard410c_bootloader_sd_linux-88.zip"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c_1036.1.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c_1036.1.bb
index ffe2ff55a..8e01e5bed 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c_1036.1.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard410c_1036.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Prebuilt bootlader images for Dragonboard 410c"
 
-LICENSE = "LICENSE.qcom"
+LICENSE = "LicenseRef-LICENSE.qcom"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4d087ee0965cb059f1b2f9429e166f64"
 
 SRC_URI = "https://artifacts.codelinaro.org/artifactory/clo-549-96boards-backup/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r${PV}.zip"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard820c_01700.1.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard820c_01700.1.bb
index ab0c53bc8..ec783213f 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard820c_01700.1.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-dragonboard820c_01700.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Prebuilt bootlader images for Dragonboard 820c"
 
-LICENSE = "LICENSE.qcom"
+LICENSE = "LicenseRef-LICENSE.qcom"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4d087ee0965cb059f1b2f9429e166f64"
 
 SRC_URI = "https://artifacts.codelinaro.org/artifactory/clo-549-96boards-backup/96boards/dragonboard820c/qualcomm/firmware/linux-board-support-package-r${PV}.zip"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-glymur.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-glymur.inc
index d0fe04174..186153451 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-glymur.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-glymur.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm GLYMUR-CRD platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE.${BPN};md5=6e1bae7ef13289c332a27b917fb49764"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/Glymur_bootbinaries.1.0/glymur_bootbinaries.1.0-test-device-public"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-iq-x7181.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-iq-x7181.inc
index a57b7bbcd..be38c0b9b 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-iq-x7181.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-iq-x7181.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm IQ-X7181 platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE.${BPN};md5=6e1bae7ef13289c332a27b917fb49764"
 
 include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-kaanapali.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-kaanapali.inc
index 3f1b42b4e..baac757cf 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-kaanapali.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-kaanapali.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm Kaanapali-MTP platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE.${BPN};md5=6e1bae7ef13289c332a27b917fb49764"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/software-product-family/Qualcomm_Linux.SPF.0.0/qualcomm_linux.spf.0.0-test-device-public"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs615.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs615.inc
index 996d79571..b3dbb28f5 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs615.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs615.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS615 platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/QCS615_bootbinaries.1.0/qcs615_bootbinaries.1.0-test-device-public"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc
index a4b1b7b5d..a0d376683 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs6490.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm Robotics RB3Gen2 platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/QCM6490_bootbinaries.1.0/qcm6490_bootbinaries.1.0-test-device-public"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc
index e81ce04ce..66287f15f 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs8300.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS8300 platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/QCS8300_bootbinaries.1.0/qcs8300_bootbinaries.1.0-test-device-public"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc
index 9efbc744a..518c57d34 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qcs9100.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QCS9100 platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/QCS9100_bootbinaries.1.0/qcs9100_bootbinaries.1.0-test-device-public"
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 8c5b3be95..1f2036ac6 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,6 +1,6 @@
 SUMMARY = "Prebuilt bootlader images for Qualcomm RB1"
 
-LICENSE = "LICENSE.qcom"
+LICENSE = "LicenseRef-LICENSE.qcom"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbe399f2c983ad51768f4561587f000"
 
 SRC_URI = "https://artifacts.codelinaro.org/artifactory/clo-549-96boards-backup/96boards/rb1/linaro/rescue/23.12/rb1-bootloader-emmc-linux-47528.zip"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-shikra.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-shikra.inc
index b34997052..6842d58e4 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-shikra.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-shikra.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm Shikra-EVK platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BOOTBINARIES}/LICENSE.qcom-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/SHIKRA_bootbinaries.1.0/shikra_bootbinaries.1.0-test-device-public"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-sm8750.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-sm8750.inc
index de9a23864..d52211d3c 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-sm8750.inc
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-sm8750.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm SM8750-MTP platform"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE.${BPN};md5=6e1bae7ef13289c332a27b917fb49764"
 
 FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/SM8750_bootbinaries.1.0/sm8750_bootbinaries.1.0-test-device-public"
diff --git a/recipes-bsp/firmware/.gitignore b/recipes-bsp/firmware/.gitignore
deleted file mode 100644
index c552b4845..000000000
--- a/recipes-bsp/firmware/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-files/NHLOS_Binaries.zip
-files/adreno_1.0_qrb5165_rb5.tar.gz
diff --git a/recipes-bsp/firmware/camxfirmware-hamoa_1.0.0.bb b/recipes-bsp/firmware/camxfirmware-hamoa_1.0.0.bb
index b52cd0bba..386c3195d 100644
--- a/recipes-bsp/firmware/camxfirmware-hamoa_1.0.0.bb
+++ b/recipes-bsp/firmware/camxfirmware-hamoa_1.0.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Qualcomm camera firmware for Hamoa"
 DESCRIPTION = "Qualcomm camera firmware to support camera functionality on Hamoa"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260514"
diff --git a/recipes-bsp/firmware/camxfirmware-kodiak_1.0.7.bb b/recipes-bsp/firmware/camxfirmware-kodiak_1.0.7.bb
index da0c063c5..6067e88af 100644
--- a/recipes-bsp/firmware/camxfirmware-kodiak_1.0.7.bb
+++ b/recipes-bsp/firmware/camxfirmware-kodiak_1.0.7.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Qualcomm camera firmware for kodiak"
 DESCRIPTION = "Qualcomm camera firmware to support camera functionality on Kodiak"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260209.1"
diff --git a/recipes-bsp/firmware/camxfirmware-lemans_1.0.7.bb b/recipes-bsp/firmware/camxfirmware-lemans_1.0.7.bb
index 1314fc612..69577af86 100644
--- a/recipes-bsp/firmware/camxfirmware-lemans_1.0.7.bb
+++ b/recipes-bsp/firmware/camxfirmware-lemans_1.0.7.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Qualcomm camera firmware for lemans"
 DESCRIPTION = "Qualcomm camera firmware to support camera functionality on lemans"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260209.1"
diff --git a/recipes-bsp/firmware/camxfirmware-talos_1.0.1.bb b/recipes-bsp/firmware/camxfirmware-talos_1.0.1.bb
index 97ddb5438..4911457a9 100644
--- a/recipes-bsp/firmware/camxfirmware-talos_1.0.1.bb
+++ b/recipes-bsp/firmware/camxfirmware-talos_1.0.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Qualcomm camera firmware for Talos"
 DESCRIPTION = "Qualcomm camera firmware to support camera functionality on Talos"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260209.1"
diff --git a/recipes-bsp/firmware/firmware-ath6kl_git.bb b/recipes-bsp/firmware/firmware-ath6kl_git.bb
index 0706c7d35..b81f549d2 100644
--- a/recipes-bsp/firmware/firmware-ath6kl_git.bb
+++ b/recipes-bsp/firmware/firmware-ath6kl_git.bb
@@ -4,9 +4,9 @@
 
 SUMMARY = "Additional firmware files for Qualcomm/Atheros Ath6k SoC"
 
-LICENSE = "Firmware-qualcommAthos_ath6kl"
+LICENSE = "LicenseRef-Firmware-qualcommAthos-ath6kl"
 LIC_FILES_CHKSUM = "file://LICENSE.qca_firmware;md5=2a397c0e988f4c52d3d526133b617c8d"
-NO_GENERIC_LICENSE[Firmware-qualcommAthos_ath6kl] = "LICENSE.qca_firmware"
+NO_GENERIC_LICENSE[Firmware-qualcommAthos-ath6kl] = "LICENSE.qca_firmware"
 
 SRC_URI = "git://github.com/qca/ath6kl-firmware;protocol=https;branch=master"
 SRCREV = "2e02576c1dab6fd35118eea1004f50aaaed3794f"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard-apq8060.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard-apq8060.bb
deleted file mode 100644
index af67aa937..000000000
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard-apq8060.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-dragonboard-apq8060 = "..."  to local.conf. Use
-# "file://" if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for Dragonboard APQ8060 board"
-
-LICENSE = "CLOSED"
-
-# dragonboard8060 firmware is unsigned, so install into generic location
-FW_QCOM_NAME = "apq8060"
-
-FW_QCOM_LIST = "q6.mbn"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-unpack_nhlos_image:append() {
-    if [ -d ${B}/firmware/IMAGE ] ; then
-        mv ${B}/firmware/IMAGE ${B}/firmware/image
-        for file in ${B}/firmware/image/* ; do
-            mv "${file}" ${B}/firmware/image/`basename ${file} | tr A-Z a-z`
-        done
-    fi
-}
-
-SPLIT_FIRMWARE_PACKAGES = " \
-    linux-firmware-qcom-${FW_QCOM_NAME}-q6 \
-"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard-apq8074.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard-apq8074.bb
deleted file mode 100644
index ce2c3556d..000000000
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard-apq8074.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-dragonboard-apq8074 = "..."  to local.conf. Use
-# "file://" if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for Dragonboard APQ8074 board"
-
-LICENSE = "CLOSED"
-
-# dragonboard8074 firmware is unsigned, so install into generic location
-FW_QCOM_NAME = "apq8074"
-
-FW_QCOM_LIST = "adsp.mbn mba.mbn modem.mbn wcnss.mbn"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = " \
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
-    linux-firmware-qcom-${FW_QCOM_NAME}-wifi \
-"
diff --git a/recipes-bsp/firmware/firmware-qcom-nhlos.inc b/recipes-bsp/firmware/firmware-qcom-nhlos.inc
deleted file mode 100644
index 199bfab82..000000000
--- a/recipes-bsp/firmware/firmware-qcom-nhlos.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-# Handle NON-HLOS.bin unpacking in a generic way
-# Include the file to be able to dissect the image using handle_nonhlos_image()
-# If NHLOS_URI is defined, the image will be dissected automatically
-#
-# If specified, NHLOS_LICENSE and NHLOS_LICENSE_MD5 specify the licence file
-# (and the checksum) for the NHLOS binaries.
-#
-# Additionally PROPRIETARY_URI can be specified. Its contents will be used to
-# provide additional firmware files (like Adreno or IPA), which are not a part
-# of NON-HLOS.bin.
-
-NHLOS_URI ??= ""
-PROPRIETARY_URI ??= ""
-
-# List all firmware files to be installed
-FW_QCOM_LIST ??= ""
-
-DEPENDS += "pil-squasher-native mtools-native"
-
-# Conditionally populate SRC_URI. We have to do it here rather than in python
-# script to let base.bbclass to pick up dependencies
-SRC_URI += "${NHLOS_URI} ${PROPRIETARY_URI}${@ ';subdir=proprietary' if d.getVar('PROPRIETARY_URI') != '' else '' }"
-
-inherit nhlos-license
-
-python() {
-    handle_nhlos_license(d, d.getVar("SPLIT_FIRMWARE_PACKAGES").split())
-}
-
-unpack_nhlos_image() {
-    mkdir -p ${B}/firmware
-    mcopy -n -s -i "$1" ::/* ${B}/firmware/
-}
-
-handle_nonhlos_image() {
-    for fw in ${B}/firmware/image/*.mdt ; do
-        pil-squasher ${B}/`basename $fw mdt`mbn $fw || exit 1
-    done
-}
-
-# If the URL is the file:// URI, the whole local path will be duplicated in the UNPACKDIR.
-# Otherwise we just need the last (filename) part of the path.
-def get_nhlos_path(path):
-    from urllib.parse import urlparse
-    if path == "":
-        return ""
-    url = urlparse(path)
-    if url.scheme == "file":
-        return url.path
-    return url.path.rsplit('/', 1)[1]
-
-do_compile:prepend() {
-    if [ -z "${NHLOS_URI}" ] ; then
-        bbwarn "${PN}: not packaging NHLOS firmware. Please provide HNLOS_URI"
-    else
-        unpack_nhlos_image ${UNPACKDIR}/${@get_nhlos_path(d.getVar("NHLOS_URI"))}
-        handle_nonhlos_image
-    fi
-}
-
-do_install:prepend() {
-    if [ -n "${NHLOS_URI}${PROPRIETARY_URI}" ] ; then
-        install_nhlos_license
-
-        install -d ${D}${FW_QCOM_PATH}
-
-        for fw in ${FW_QCOM_LIST} ; do
-            if [ -r ${S}/proprietary/$fw ] ; then
-                install -m 0644 ${S}/proprietary/$fw ${D}${FW_QCOM_PATH}
-            elif [ -r ${B}/$fw ] ; then
-                install -m 0644 ${B}/$fw ${D}${FW_QCOM_PATH}
-            elif [ -r ${B}/firmware/image/$fw ] ; then
-                if [ -d ${B}/firmware/image/$fw ] ; then
-                    find ${B}/firmware/image/$fw -type f | while read f ; do
-                        relpath="${f#${B}/firmware/image/}"
-                        install -Dm 0644 "$f" ${D}${FW_QCOM_PATH}/"$relpath"
-                    done
-                else
-                    install -m 0644 ${B}/firmware/image/$fw ${D}${FW_QCOM_PATH}
-                fi
-            fi
-        done
-    fi
-}
-
-# Make sure that there is nothing in the meta-package, all firmware must go to
-# a particular package.
-FILES:${PN} = ""
diff --git a/recipes-bsp/firmware/firmware-qcom-qar2130p.bb b/recipes-bsp/firmware/firmware-qcom-qar2130p.bb
deleted file mode 100644
index 527111b64..000000000
--- a/recipes-bsp/firmware/firmware-qcom-qar2130p.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sar2130p = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for QAR2130P device"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sar2130p"
-
-FW_QCOM_LIST = "\
-    a620_zap.mbn \
-    adsp.mbn adsp_dtb.mbn adspr.jsn adsps.jsn adspua.jsn \
-    cdsp.mbn cdsp_dtb.mbn cdspr.jsn \
-    ipa_fws.mbn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-adreno \
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-    linux-firmware-qcom-adreno-gmu-a621 \
-"
-
-do_install:prepend() {
-    if [ -r "${UNPACKDIR}/proprietary/a621_gmu.bin" ] ; then
-        install -d ${D}${FW_QCOM_BASE_PATH}
-        install -m 0644 ${UNPACKDIR}/proprietary/a621_gmu.bin ${D}${FW_QCOM_BASE_PATH}
-    fi
-
-    if [ -n "${NHLOS_URI}" ] ; then
-        install -d ${D}/${nonarch_base_libdir}/firmware/ath12k/WCN7850/hw2.0/
-        install -m 0644 ${UNPACKDIR}/firmware/image/kiwi/bdwlan.e30 ${D}/${nonarch_base_libdir}/firmware/ath12k/WCN7850/hw2.0/board.bin
-    fi
-}
-
-FILES:linux-firmware-qcom-adreno-gmu-a621 += "${FW_QCOM_BASE_PATH}/a621_gmu.bin*"
-FILES:${PN} += "${nonarch_base_libdir}/firmware/ath12k"
diff --git a/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb b/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb
index b88dcb7df..34e9be755 100644
--- a/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb
+++ b/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb
@@ -1,10 +1,9 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-qcm6490-idp = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
+# Placeholder recipe, actual modem firmware is provided in a separate layer
 
 DESCRIPTION = "QCOM Firmware for QCM6490-IDP board"
 
-LICENSE = "CLOSED"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 FW_QCOM_NAME = "qcm6490"
 
@@ -15,8 +14,9 @@ FW_QCOM_LIST = "\
 S = "${UNPACKDIR}"
 
 require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
 
 SPLIT_FIRMWARE_PACKAGES = "\
     linux-firmware-qcom-${FW_QCOM_NAME}-modem \
 "
+
+FILES:linux-firmware-qcom-${FW_QCOM_NAME}-modem = ""
diff --git a/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb b/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb
index 6862048ea..8f55d33bb 100644
--- a/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb
+++ b/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb
@@ -1,10 +1,9 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-rb3gen2 = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
+# Placeholder recipe, actual modem firmware is provided in a separate layer
 
 DESCRIPTION = "QCOM Firmware for Rb3 Gen2 board"
 
-LICENSE = "CLOSED"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 FW_QCOM_NAME = "qcs6490"
 
@@ -15,8 +14,9 @@ FW_QCOM_LIST = "\
 S = "${UNPACKDIR}"
 
 require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
 
 SPLIT_FIRMWARE_PACKAGES = "\
     linux-firmware-qcom-${FW_QCOM_NAME}-modem \
 "
+
+FILES:linux-firmware-qcom-${FW_QCOM_NAME}-modem = ""
diff --git a/recipes-bsp/firmware/firmware-qcom-sdm845-hdk.bb b/recipes-bsp/firmware/firmware-qcom-sdm845-hdk.bb
deleted file mode 100644
index 5db4e31f4..000000000
--- a/recipes-bsp/firmware/firmware-qcom-sdm845-hdk.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sdm845-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for SDM845 HDK (aka HDK845) board"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sdm845-hdk"
-FW_QCOM_SUBDIR = "sdm845/Qualcomm/SDM845-HDK"
-
-# ADSP, CDSP, modem and WLAN are a part of linux-firmware
-FW_QCOM_LIST = "\
-    ipa_fws.mbn \
-    slpi.mbn slpir.jsn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
-"
diff --git a/recipes-bsp/firmware/firmware-qcom-sm8150-hdk.bb b/recipes-bsp/firmware/firmware-qcom-sm8150-hdk.bb
deleted file mode 100644
index 54b0ece2b..000000000
--- a/recipes-bsp/firmware/firmware-qcom-sm8150-hdk.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sm8350-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for SM8150 HDK (aka HDK855) board"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sm8150"
-
-FW_QCOM_LIST = "\
-    adsp.mbn adspr.jsn adspua.jsn \
-    cdsp.mbn cdspr.jsn \
-    ipa_fws.mbn \
-    modem.mbn modemuw.jsn \
-    slpi.mbn slpir.jsn \
-    wlanmdsp.mbn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
-    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
-    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
-    linux-firmware-qcom-${FW_QCOM_NAME}-wifi \
-"
-
-do_install:prepend() {
-    if [ -r "${S}/proprietary/venus.mbn" ] ; then
-        install -d ${D}${FW_QCOM_BASE_PATH}/vpu
-        install -m 0644 ${S}/proprietary/venus.mbn ${D}${FW_QCOM_BASE_PATH}/vpu/vpu10_2v.mbn
-    fi
-}
diff --git a/recipes-bsp/firmware/firmware-qcom-sm8350-hdk.bb b/recipes-bsp/firmware/firmware-qcom-sm8350-hdk.bb
deleted file mode 100644
index 5486381aa..000000000
--- a/recipes-bsp/firmware/firmware-qcom-sm8350-hdk.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sm8350-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for SM8350 HDK (aka HDK888) board"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sm8350"
-
-FW_QCOM_LIST = "\
-    adsp.mbn adspr.jsn adspua.jsn battmgr.jsn \
-    cdsp.mbn cdspr.jsn \
-    ipa_fws.mbn \
-    modem.mbn modemr.jsn \
-    slpi.mbn slpir.jsn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
-    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
-    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
-"
-
-# Different vpu20_4v.mbn files are not compatible and support different
-# platforms. Use platform-specific name for the file in generic location.
-do_install:prepend() {
-    if [ -r "${S}/proprietary/vpu20_4v.mbn" ] ; then
-        install -d ${D}${FW_QCOM_BASE_PATH}/vpu
-        install -m 0644 ${S}/proprietary/vpu20_4v.mbn ${D}${FW_QCOM_BASE_PATH}/vpu/vpu20_4v_sm8350.mbn
-    fi
-}
diff --git a/recipes-bsp/firmware/firmware-qcom-sm8450-hdk.bb b/recipes-bsp/firmware/firmware-qcom-sm8450-hdk.bb
deleted file mode 100644
index 1931138c0..000000000
--- a/recipes-bsp/firmware/firmware-qcom-sm8450-hdk.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sm8450-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for SM8450 HDK board"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sm8450"
-
-FW_QCOM_LIST = "\
-    adsp.mbn adspr.jsn adspua.jsn battmgr.jsn \
-    cdsp.mbn cdspr.jsn \
-    ipa_fws.mbn \
-    modem.mbn modemr.jsn \
-    slpi.mbn slpir.jsn slpius.jsn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
-    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
-    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
-"
-
-# Different vpu20_4v.mbn files are not compatible and support different
-# platforms. Use platform-specific name for the file in generic location.
-do_install:prepend() {
-    if [ -r "${S}/proprietary/vpu20_4v.mbn" ] ; then
-        install -d ${D}${FW_QCOM_BASE_PATH}/vpu
-        install -m 0644 ${S}/proprietary/vpu20_4v.mbn ${D}${FW_QCOM_BASE_PATH}/vpu/vpu20_4v_sm8450.mbn
-    fi
-}
diff --git a/recipes-bsp/firmware/firmware-qcom-sm8550-hdk.bb b/recipes-bsp/firmware/firmware-qcom-sm8550-hdk.bb
deleted file mode 100644
index 20ed9b0c5..000000000
--- a/recipes-bsp/firmware/firmware-qcom-sm8550-hdk.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sm8450-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for SM8550 HDK board"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sm8550"
-
-FW_QCOM_LIST = "\
-    adsp.mbn adsp_dtb.mbn adspr.jsn adsps.jsn adspua.jsn battmgr.jsn \
-    cdsp.mbn cdsp_dtb.mbn cdspr.jsn \
-    ipa_fws.mbn \
-    modem.mbn modemr.jsn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
-"
diff --git a/recipes-bsp/firmware/firmware-qcom-sm8650-hdk.bb b/recipes-bsp/firmware/firmware-qcom-sm8650-hdk.bb
deleted file mode 100644
index 43a74c205..000000000
--- a/recipes-bsp/firmware/firmware-qcom-sm8650-hdk.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Specify location of the corresponding NON-HLOS.bin file by adding
-# NHLOS_URI:pn-firmware-qcom-sm8450-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "QCOM Firmware for SM8650 HDK board"
-
-LICENSE = "CLOSED"
-
-FW_QCOM_NAME = "sm8650"
-
-FW_QCOM_LIST = "\
-    adsp.mbn adsp_dtb.mbn adspr.jsn adsps.jsn adspua.jsn battmgr.jsn \
-    cdsp.mbn cdsp_dtb.mbn cdspr.jsn \
-    ipa_fws.mbn \
-"
-
-S = "${UNPACKDIR}"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-require recipes-bsp/firmware/firmware-qcom-nhlos.inc
-
-SPLIT_FIRMWARE_PACKAGES = "\
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute \
-    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
-"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-qar2130p.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-qar2130p.bb
deleted file mode 100644
index b81cb37a8..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-qar2130p.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-qar2130p = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for QAR2130P device"
-
-DSPSO_SOC = "sar2130p"
-DSPSO_DEVICE = "QAR2130P"
-DSPSO_DEVICE_MODEL = "Qualcomm Snapdragon AR2 Gen1 Smart Viewer Development Kit"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-require hexagon-dspso.inc
-
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "1"
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "1"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sdm845-hdk.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sdm845-hdk.bb
deleted file mode 100644
index be07badad..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sdm845-hdk.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-sm8150-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for SDM845 HDK (aka HDK845) board"
-
-DSPSO_SOC = "sdm845"
-DSPSO_DEVICE = "SDM845-HDK"
-
-# Config for SDM845-HDK is a part of the main repo
-DSPSO_CONFIG = "hexagon-dsp-binaries-qualcomm-sdm845-hdk-config"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-# Only package SLPI binaries, ADSP and CDSP are provided by
-# hexagon-dsp-binaries
-DSPSO_PACKAGES = " \
-    hexagon-dsp-binaries-${DSP_PKG_NAME}-sdsp \
-"
-
-require hexagon-dspso.inc
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8150-hdk.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8150-hdk.bb
deleted file mode 100644
index 35faaf40b..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8150-hdk.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-sm8150-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for SM8150 HDK (aka HDK855) board"
-
-DSPSO_SOC = "sm8150"
-DSPSO_DEVICE = "SM8150-HDK"
-DSPSO_DEVICE_MODEL = "Qualcomm Technologies, Inc. SM8150 HDK"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-require hexagon-dspso.inc
-
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "1"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8350-hdk.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8350-hdk.bb
deleted file mode 100644
index 7e77389ab..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8350-hdk.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-sm8350-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for SM8350 HDK (aka HDK888) board"
-
-DSPSO_SOC = "sm8350"
-DSPSO_DEVICE = "SM8350-HDK"
-DSPSO_DEVICE_MODEL = "Qualcomm Technologies, Inc. SM8350 HDK"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-require hexagon-dspso.inc
-
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "1"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8450-hdk.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8450-hdk.bb
deleted file mode 100644
index 33a7207c1..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8450-hdk.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-sm8450-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for SM8450 HDK board"
-
-DSPSO_SOC = "sm8450"
-DSPSO_DEVICE = "SM8450-HDK"
-DSPSO_DEVICE_MODEL = "Qualcomm Technologies, Inc. SM8450 HDK"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-require hexagon-dspso.inc
-
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "1"
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "1"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8550-hdk.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8550-hdk.bb
deleted file mode 100644
index 59bdefb47..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8550-hdk.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-sm8550-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for SM8550 HDK board"
-
-DSPSO_SOC = "sm8550"
-DSPSO_DEVICE = "SM8550-HDK"
-DSPSO_DEVICE_MODEL = "Qualcomm Technologies, Inc. SM8550 HDK"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-require hexagon-dspso.inc
-
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "1"
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "1"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8650-hdk.bb b/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8650-hdk.bb
deleted file mode 100644
index 7f4049b65..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso-qcom-sm8650-hdk.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Specify location of the corresponding dspso.bin file by adding
-# DSPSO_URI:pn-firmware-qcom-sm8650-hdk = "..."  to local.conf. Use "file://"
-# if the file is provided locally.
-
-DESCRIPTION = "Hexagon DSP binaries for SM8650 HDK board"
-
-DSPSO_SOC = "sm8650"
-DSPSO_DEVICE = "SM8650-HDK"
-DSPSO_DEVICE_MODEL = "Qualcomm Technologies, Inc. SM8650 HDK"
-
-LICENSE = "CLOSED"
-DEPENDS = "firmware-${DSP_PKG_NAME}"
-S = "${UNPACKDIR}"
-
-require hexagon-dspso.inc
-
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "1"
-SKIP_FILEDEPS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "1"
diff --git a/recipes-bsp/hexagon-dspso/hexagon-dspso.inc b/recipes-bsp/hexagon-dspso/hexagon-dspso.inc
deleted file mode 100644
index 6a76cd254..000000000
--- a/recipes-bsp/hexagon-dspso/hexagon-dspso.inc
+++ /dev/null
@@ -1,120 +0,0 @@
-# Handle dspso.bin unpacking in a generic way
-# If DSPSO_URI is defined, the image will be dissected automatically
-
-DSPSO_URI ??= ""
-
-DSPSO_SOC ?= "unknown"
-DSPSO_VENDOR ?= "Qualcomm"
-DSPSO_DEVICE ?= "Unknown"
-
-DSPSO_PACKAGES ?= " \
-    hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp \
-    hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp \
-    hexagon-dsp-binaries-${DSP_PKG_NAME}-sdsp \
-"
-
-# Conditionally populate SRC_URI. We have to do it here rather than in python
-# script to let base.bbclass to pick up dependencies
-SRC_URI += "${DSPSO_URI}"
-
-# Extract package name part
-DSP_PKG_NAME ?= "${@d.getVar("PN").split("hexagon-dspso-")[-1]}"
-
-DSP_QCOM_BASE_PATH = "${datadir}/qcom"
-DSP_QCOM_CONF_D_PATH = "${DSP_QCOM_BASE_PATH}/conf.d"
-DSP_QCOM_SUBPATH = "${DSPSO_SOC}/${DSPSO_VENDOR}/${DSPSO_DEVICE}"
-DSP_QCOM_PATH = "${DSP_QCOM_BASE_PATH}/${DSP_QCOM_SUBPATH}"
-
-DSPSO_CONFIG ?= "hexagon-dsp-binaries-${DSP_PKG_NAME}-config"
-
-DEPENDS += "e2fsprogs-native"
-
-inherit allarch
-
-PACKAGES:append = " \
-    hexagon-dsp-binaries-${DSP_PKG_NAME}-config \
-    ${DSPSO_PACKAGES} \
-"
-
-inherit nhlos-license
-
-python() {
-    handle_nhlos_license(d, d.getVar("DSPSO_PACKAGES").split())
-}
-
-RDEPENDS:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "${DSPSO_CONFIG}"
-RDEPENDS:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "${DSPSO_CONFIG}"
-RDEPENDS:hexagon-dsp-binaries-${DSP_PKG_NAME}-sdsp = "${DSPSO_CONFIG}"
-
-FILES:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "${DSP_QCOM_PATH}/dsp/adsp"
-FILES:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "${DSP_QCOM_PATH}/dsp/cdsp"
-FILES:hexagon-dsp-binaries-${DSP_PKG_NAME}-config = "${DSP_QCOM_CONF_D_PATH}"
-FILES:hexagon-dsp-binaries-${DSP_PKG_NAME}-sdsp = "${DSP_QCOM_PATH}/dsp/sdsp"
-
-INSANE_SKIP:hexagon-dsp-binaries-${DSP_PKG_NAME}-adsp = "arch libdir file-rdeps textrel"
-INSANE_SKIP:hexagon-dsp-binaries-${DSP_PKG_NAME}-cdsp = "arch libdir file-rdeps textrel"
-INSANE_SKIP:hexagon-dsp-binaries-${DSP_PKG_NAME}-sdsp = "arch libdir file-rdeps textrel"
-
-# If the URL is the file:// URI, the whole local path will be duplicated in the UNPACKDIR.
-# Otherwise we just need the last (filename) part of the path.
-def get_dspso_path(path):
-    from urllib.parse import urlparse
-    if path == "":
-        return ""
-    url = urlparse(path)
-    if url.scheme == "file":
-        return url.path
-    return url.path.rsplit('/', 1)[1]
-
-handle_dspso_image() {
-    for path in adsp cdsp sdsp ; do
-        case "${PACKAGES}" in
-	    *${path}*)
-	    ;;
-	    *)
-	    continue
-	    ;;
-	esac
-        mkdir -p ${B}/dspso-$path
-        debugfs $1 -R "ls -p /$path" | \
-            grep '^/[0-9]*/100' | cut -d/ -f6 | \
-            while read name ; do echo "dump /$path/$name ${B}/dspso-$path/$name" ; done | \
-            debugfs ${1}
-    done
-}
-
-generate_config() {
-    if [ -n "${DSPSO_DEVICE_MODEL}" ] ; then
-        cat >> ${B}/${BPN}.yaml << EOF
-machines:
-  ${DSPSO_DEVICE_MODEL}:
-    DSP_LIBRARY_PATH: ${DSP_QCOM_SUBPATH}
-EOF
-    fi
-}
-
-do_compile:prepend() {
-    if [ -z "${DSPSO_URI}" ] ; then
-        bbwarn "${PN}: not packaging DSPSO firmware. Please provide DSPSO_URI"
-    else
-        handle_dspso_image ${UNPACKDIR}/${@get_dspso_path(d.getVar("DSPSO_URI"))}
-    fi
-    generate_config
-}
-
-do_install:prepend() {
-    if [ -n "${DSPSO_URI}" ] ; then
-        install_nhlos_license
-    fi
-    if [ -f "${B}/${BPN}.yaml" ] ; then
-        install -d ${D}${DSP_QCOM_CONF_D_PATH}
-        install -m 0644 ${B}/${BPN}.yaml ${D}${DSP_QCOM_CONF_D_PATH}
-    fi
-    ls ${B}/dspso-adsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/adsp && install -m 0644 ${B}/dspso-adsp/* ${D}${DSP_QCOM_PATH}/dsp/adsp
-    ls ${B}/dspso-cdsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/cdsp && install -m 0644 ${B}/dspso-cdsp/* ${D}${DSP_QCOM_PATH}/dsp/cdsp
-    ls ${B}/dspso-sdsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/sdsp && install -m 0644 ${B}/dspso-sdsp/* ${D}${DSP_QCOM_PATH}/dsp/sdsp
-}
-
-# Make sure that there is nothing in the meta-package, all firmware must go to
-# a particular package.
-FILES:${PN} = ""
diff --git a/recipes-bsp/images/initramfs-firmware-db8074-image.bb b/recipes-bsp/images/initramfs-firmware-db8074-image.bb
deleted file mode 100644
index 54e51eb38..000000000
--- a/recipes-bsp/images/initramfs-firmware-db8074-image.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with Dragonboard APQ8074 firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-dragonboard-apq8074-firmware \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-mega-image.bb b/recipes-bsp/images/initramfs-firmware-mega-image.bb
index 70b000b7e..430b0a2a2 100644
--- a/recipes-bsp/images/initramfs-firmware-mega-image.bb
+++ b/recipes-bsp/images/initramfs-firmware-mega-image.bb
@@ -7,7 +7,6 @@ PACKAGE_INSTALL = " \
 
 # Qualcomm Dragonboard / Robotics platforms
 PACKAGE_INSTALL += " \
-    packagegroup-dragonboard-apq8074-firmware \
     packagegroup-dragonboard410c-firmware \
     packagegroup-dragonboard820c-firmware \
     packagegroup-dragonboard845c-firmware \
@@ -37,24 +36,4 @@ PACKAGE_INSTALL += " \
     packagegroup-sa8775p-ride-hexagon-dsp-binaries \
 "
 
-# Qualcomm HDKs
-PACKAGE_INSTALL += " \
-    packagegroup-sm8150-hdk-firmware \
-    packagegroup-sm8350-hdk-firmware \
-    packagegroup-sm8450-hdk-firmware \
-    packagegroup-sm8550-hdk-firmware \
-    packagegroup-sm8650-hdk-firmware \
-    packagegroup-sm8150-hdk-hexagon-dsp-binaries \
-    packagegroup-sm8350-hdk-hexagon-dsp-binaries \
-    packagegroup-sm8450-hdk-hexagon-dsp-binaries \
-    packagegroup-sm8550-hdk-hexagon-dsp-binaries \
-    packagegroup-sm8650-hdk-hexagon-dsp-binaries \
-"
-
-# Other Qualcomm DevKits
-PACKAGE_INSTALL += " \
-    packagegroup-qar2130p-firmware \
-    packagegroup-qar2130p-hexagon-dsp-binaries \
-"
-
 require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-qar2130p-image.bb b/recipes-bsp/images/initramfs-firmware-qar2130p-image.bb
deleted file mode 100644
index dd3cd2d51..000000000
--- a/recipes-bsp/images/initramfs-firmware-qar2130p-image.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with QAR2130P devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-qar2130p-firmware \
-"
-
-BAD_RECOMMENDATIONS = " \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sdm845-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sdm845-hdk-image.bb
deleted file mode 100644
index 613e5df86..000000000
--- a/recipes-bsp/images/initramfs-firmware-sdm845-hdk-image.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with SDM845 HDK devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-sdm845-hdk-firmware \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb
deleted file mode 100644
index bc14156c2..000000000
--- a/recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with SM8150 HDK devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-sm8150-hdk-firmware \
-"
-
-BAD_RECOMMENDATIONS = " \
-    linux-firmware-qcom-sm8150-sensors \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb
deleted file mode 100644
index e346d70e1..000000000
--- a/recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with SM8350 HDK devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-sm8350-hdk-firmware \
-"
-
-BAD_RECOMMENDATIONS = " \
-    linux-firmware-qcom-sm8350-sensors \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8450-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8450-hdk-image.bb
deleted file mode 100644
index b516361d5..000000000
--- a/recipes-bsp/images/initramfs-firmware-sm8450-hdk-image.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with SM8450 HDK devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-sm8450-hdk-firmware \
-"
-
-BAD_RECOMMENDATIONS = " \
-    linux-firmware-qcom-sm8450-sensors \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8550-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8550-hdk-image.bb
deleted file mode 100644
index f831c7fea..000000000
--- a/recipes-bsp/images/initramfs-firmware-sm8550-hdk-image.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with SM8550 HDK devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-sm8550-hdk-firmware \
-"
-
-BAD_RECOMMENDATIONS = " \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/images/initramfs-firmware-sm8650-hdk-image.bb b/recipes-bsp/images/initramfs-firmware-sm8650-hdk-image.bb
deleted file mode 100644
index bf9ea6845..000000000
--- a/recipes-bsp/images/initramfs-firmware-sm8650-hdk-image.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Tiny ramdisk image with SM8650 HDK devices firmware files"
-
-PACKAGE_INSTALL += " \
-    packagegroup-sm8650-hdk-firmware \
-    packagegroup-sm8550-hdk-firmware \
-"
-
-BAD_RECOMMENDATIONS = " \
-"
-
-require initramfs-firmware-image.inc
diff --git a/recipes-bsp/packagegroups/packagegroup-dragonboard-apq8074.bb b/recipes-bsp/packagegroups/packagegroup-dragonboard-apq8074.bb
deleted file mode 100644
index 27a0686ff..000000000
--- a/recipes-bsp/packagegroups/packagegroup-dragonboard-apq8074.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "Packages for the Dragonboard APQ8074 board"
-
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx', '', d)} \
-    linux-firmware-qcom-apq8074-audio \
-    linux-firmware-qcom-apq8074-modem \
-    linux-firmware-qcom-apq8074-wifi \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-qar2130p.bb b/recipes-bsp/packagegroups/packagegroup-qar2130p.bb
deleted file mode 100644
index aa91d8bc3..000000000
--- a/recipes-bsp/packagegroups/packagegroup-qar2130p.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-a650 linux-firmware-qcom-adreno-gmu-a621 linux-firmware-qcom-sar2130p-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850', '', d)} \
-    firmware-qcom-qar2130p \
-    linux-firmware-qcom-sar2130p-audio \
-    linux-firmware-qcom-sar2130p-compute \
-"
-
-RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-qcom-qar2130p-adsp \
-    hexagon-dsp-binaries-qcom-qar2130p-cdsp \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-sdm845-hdk.bb b/recipes-bsp/packagegroups/packagegroup-sdm845-hdk.bb
deleted file mode 100644
index 1655f55b9..000000000
--- a/recipes-bsp/packagegroups/packagegroup-sdm845-hdk.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Packages for the SDM845-HDK (aka HDK845) board"
-
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-sdm845-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-wil6210', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
-    linux-firmware-qcom-sdm845-audio \
-    linux-firmware-qcom-sdm845-compute \
-    linux-firmware-qcom-sdm845-modem \
-    linux-firmware-qcom-sdm845-hdk-sensors \
-"
-
-# FIXME
-RDEPENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-thundercomm-db845c-adsp \
-    hexagon-dsp-binaries-thundercomm-db845c-cdsp \
-    hexagon-dsp-binaries-qcom-sdm845-hdk-sdsp \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-sm8150-hdk.bb b/recipes-bsp/packagegroups/packagegroup-sm8150-hdk.bb
deleted file mode 100644
index 1286a9eb0..000000000
--- a/recipes-bsp/packagegroups/packagegroup-sm8150-hdk.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Packages for the SM8150-HDK (aka HDK855) board"
-
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-a640 linux-firmware-qcom-sm8150-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-qcom-sm8150-wifi', '', d)} \
-    firmware-qcom-sm8150-hdk \
-    linux-firmware-qcom-sm8150-audio \
-    linux-firmware-qcom-sm8150-compute \
-    linux-firmware-qcom-sm8150-ipa \
-    linux-firmware-qcom-sm8150-modem \
-    linux-firmware-qcom-sm8150-sensors \
-"
-
-RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-qcom-sm8150-hdk-adsp \
-    hexagon-dsp-binaries-qcom-sm8150-hdk-cdsp \
-    hexagon-dsp-binaries-qcom-sm8150-hdk-sdsp \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-sm8350-hdk.bb b/recipes-bsp/packagegroups/packagegroup-sm8350-hdk.bb
deleted file mode 100644
index ceac0015d..000000000
--- a/recipes-bsp/packagegroups/packagegroup-sm8350-hdk.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Packages for the SM8350-HDK (aka HDK888) board"
-
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-a660 linux-firmware-qcom-sm8350-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-qca2066', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k-wcn6855', '', d)} \
-    firmware-qcom-sm8350-hdk \
-    linux-firmware-lt9611uxc \
-    linux-firmware-qcom-sm8350-audio \
-    linux-firmware-qcom-sm8350-compute \
-    linux-firmware-qcom-sm8350-ipa \
-    linux-firmware-qcom-sm8350-modem \
-    linux-firmware-qcom-sm8350-sensors \
-    linux-firmware-qcom-vpu \
-"
-
-RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-qcom-sm8350-hdk-adsp \
-    hexagon-dsp-binaries-qcom-sm8350-hdk-cdsp \
-    hexagon-dsp-binaries-qcom-sm8350-hdk-sdsp \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-sm8450-hdk.bb b/recipes-bsp/packagegroups/packagegroup-sm8450-hdk.bb
deleted file mode 100644
index 5595722d4..000000000
--- a/recipes-bsp/packagegroups/packagegroup-sm8450-hdk.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Packages for the SM8450-HDK board"
-
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-a730 linux-firmware-qcom-sm8450-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-qca2066', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k-wcn6855', '', d)} \
-    firmware-qcom-sm8450-hdk \
-    linux-firmware-lt9611uxc \
-    linux-firmware-qcom-sm8450-audio \
-    linux-firmware-qcom-sm8450-compute \
-    linux-firmware-qcom-sm8450-modem \
-    linux-firmware-qcom-sm8450-sensors \
-"
-
-RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-qcom-sm8450-hdk-adsp \
-    hexagon-dsp-binaries-qcom-sm8450-hdk-cdsp \
-    hexagon-dsp-binaries-qcom-sm8450-hdk-sdsp \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-sm8550-hdk.bb b/recipes-bsp/packagegroups/packagegroup-sm8550-hdk.bb
deleted file mode 100644
index 2066b8f08..000000000
--- a/recipes-bsp/packagegroups/packagegroup-sm8550-hdk.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-a740 linux-firmware-qcom-sm8550-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850', '', d)} \
-    firmware-qcom-sm8550-hdk \
-    linux-firmware-lt9611uxc \
-    linux-firmware-qcom-sm8550-audio \
-    linux-firmware-qcom-sm8550-compute \
-    linux-firmware-qcom-sm8550-ipa \
-    linux-firmware-qcom-sm8550-modem \
-"
-
-RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-qcom-sm8550-hdk-adsp \
-    hexagon-dsp-binaries-qcom-sm8550-hdk-cdsp \
-"
diff --git a/recipes-bsp/packagegroups/packagegroup-sm8650-hdk.bb b/recipes-bsp/packagegroups/packagegroup-sm8650-hdk.bb
deleted file mode 100644
index e24325d06..000000000
--- a/recipes-bsp/packagegroups/packagegroup-sm8650-hdk.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Packages for the SM8650-HDK board"
-
-inherit packagegroup
-
-PACKAGES = " \
-    ${PN}-firmware \
-    ${PN}-hexagon-dsp-binaries \
-"
-
-RRECOMMENDS:${PN}-firmware = " \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'opencl opengl vulkan', 'linux-firmware-qcom-adreno-g709 linux-firmware-qcom-sm8650-adreno', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850', '', d)} \
-    firmware-qcom-sm8650-hdk \
-    linux-firmware-lt9611uxc \
-    linux-firmware-qcom-sm8650-audio \
-    linux-firmware-qcom-sm8650-audio-tplg \
-    linux-firmware-qcom-sm8650-compute \
-    linux-firmware-qcom-sm8650-ipa \
-"
-
-RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
-    hexagon-dsp-binaries-qcom-sm8650-hdk-adsp \
-    hexagon-dsp-binaries-qcom-sm8650-hdk-cdsp \
-"
diff --git a/recipes-graphics/adreno/qcom-adreno_1.877.3.bb b/recipes-graphics/adreno/qcom-adreno_1.877.3.bb
index b4af83347..c4e3291a8 100644
--- a/recipes-graphics/adreno/qcom-adreno_1.877.3.bb
+++ b/recipes-graphics/adreno/qcom-adreno_1.877.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Collection of prebuilt User Mode libraries to support OpenGL ES,
                For Qualcomm-specific OpenCL extensions declared in cl_ext_qcom.h, documentation is available in the Adreno OpenCL SDK: \
                https://softwarecenter.qualcomm.com/catalog/item/Adreno_OpenCL_SDK"
 
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://NO.LOGIN.BINARY.LICENSE.QTI.pdf;md5=4ceffe94cb40cdce6d2f4fb93cc063d1 \
                     file://NOTICE;md5=356106e5f0928f95d25f52304574ba35 "
 
diff --git a/recipes-ml/qairt/qairt-sdk_2.47.0.260601.bb b/recipes-ml/qairt/qairt-sdk_2.47.0.260601.bb
index 120552cc8..e19209ff7 100644
--- a/recipes-ml/qairt/qairt-sdk_2.47.0.260601.bb
+++ b/recipes-ml/qairt/qairt-sdk_2.47.0.260601.bb
@@ -7,7 +7,7 @@ while also supporting the development of ML applications. \
 "
 HOMEPAGE = "https://docs.qualcomm.com/doc/80-63442-10/topic/general_overview.html"
 
-LICENSE = "qcom-ai-stack"
+LICENSE = "LicenseRef-qcom-ai-stack"
 LIC_FILES_CHKSUM = "file://LICENSE.pdf;md5=878b885995f453e328edbcd5a1302306"
 NO_GENERIC_LICENSE[qcom-ai-stack] = "LICENSE.pdf"
 
diff --git a/recipes-multimedia/camx/camx-dlkm_1.0.5.bb b/recipes-multimedia/camx/camx-dlkm_1.0.5.bb
index ddcb37c9c..1727a0d66 100644
--- a/recipes-multimedia/camx/camx-dlkm_1.0.5.bb
+++ b/recipes-multimedia/camx/camx-dlkm_1.0.5.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Qualcomm Camera driver (CAMX)"
 HOMEPAGE = "https://github.com/qualcomm-linux/camera-driver"
-LICENSE = "GPL-2.0-with-Linux-syscall-note"
+LICENSE = "GPL-2.0-only WITH Linux-syscall-note"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = " \
diff --git a/recipes-multimedia/camx/camxcommon-headers_1.0.11.bb b/recipes-multimedia/camx/camxcommon-headers_1.0.11.bb
index 9de35027f..a45e67692 100644
--- a/recipes-multimedia/camx/camxcommon-headers_1.0.11.bb
+++ b/recipes-multimedia/camx/camxcommon-headers_1.0.11.bb
@@ -2,7 +2,7 @@ SUMMARY = "CamX common headers"
 
 DESCRIPTION = "This recipe provides headers for all Qualcomm CamX stacks"
 
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260616.1"
diff --git a/recipes-multimedia/fastcv/qcom-fastcv-binaries_1.8.7.bb b/recipes-multimedia/fastcv/qcom-fastcv-binaries_1.8.7.bb
index 22ac3c490..abf76fe7d 100644
--- a/recipes-multimedia/fastcv/qcom-fastcv-binaries_1.8.7.bb
+++ b/recipes-multimedia/fastcv/qcom-fastcv-binaries_1.8.7.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Optimized Qualcomm FastCV library for Image Processing and Computer Vision"
 DESCRIPTION = "Qualcomm FastCV userspace library supporting Image Processing and Computer Vision applications"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/usr/share/doc/${PN}/NOLOGINBINARYLICENSEQTI.pdf;md5=4ceffe94cb40cdce6d2f4fb93cc063d1 \
                     file://${UNPACKDIR}/usr/share/doc/${PN}/NOTICE;md5=4b722aa0574e24873e07b94e40b92e4d "
 
diff --git a/recipes-multimedia/imsdk/smart-venc-ctrl-algo_1.0.1.bb b/recipes-multimedia/imsdk/smart-venc-ctrl-algo_1.0.1.bb
index c75938811..bcd949321 100644
--- a/recipes-multimedia/imsdk/smart-venc-ctrl-algo_1.0.1.bb
+++ b/recipes-multimedia/imsdk/smart-venc-ctrl-algo_1.0.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Smart Video Encoder Control Algorithm Prebuilt Libraries"
 DESCRIPTION = "Provides prebuilt binaries for the Smart Video Encoder Control Algorithm, used to dynamically optimize video encoding parameters and performance."
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/usr/share/doc/qcom-video-ctrl/LICENSE.qcom-2;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 PBT_BUILD_DATE = "260709"
diff --git a/recipes-test/diag-router/diag-router_1.0.3.bb b/recipes-test/diag-router/diag-router_1.0.3.bb
index a5a9b10fa..bea301746 100644
--- a/recipes-test/diag-router/diag-router_1.0.3.bb
+++ b/recipes-test/diag-router/diag-router_1.0.3.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Prebuilt Qualcomm diagnostic router application"
 DESCRIPTION = "Prebuilt routing application for diagnostic traffic"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://usr/share/doc/diag-router/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 SRC_URI = "https://softwarecenter.qualcomm.com/nexus/generic/software/chip/component/core-technologies.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto/diag-router_15.0+really${PV}_armv8a.tar.gz"
diff --git a/recipes-test/libdiag/libdiag_1.0.5.bb b/recipes-test/libdiag/libdiag_1.0.5.bb
index 3c95dfe9d..706503922 100644
--- a/recipes-test/libdiag/libdiag_1.0.5.bb
+++ b/recipes-test/libdiag/libdiag_1.0.5.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Prebuilt Qualcomm diagnostic library and utility applications"
 DESCRIPTION = "Prebuilt library and utility applications for diagnostic traffic"
-LICENSE = "LICENSE.qcom-2"
+LICENSE = "LicenseRef-LICENSE.qcom-2"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/usr/share/doc/diag/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0"
 
 SRC_URI = "https://softwarecenter.qualcomm.com/nexus/generic/software/chip/component/core-technologies.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto/diag_15.0.qcom+really${PV}_armv8a.tar.gz"