diff --git a/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb b/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb
new file mode 100644
index 000000000..58376d411
--- /dev/null
+++ b/recipes-bsp/firmware/firmware-qcom-qcm6490-idp.bb
@@ -0,0 +1,22 @@
+# 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.
+
+DESCRIPTION = "QCOM Firmware for QCM6490-IDP board"
+
+LICENSE = "CLOSED"
+
+FW_QCOM_NAME = "qcm6490"
+
+FW_QCOM_LIST = "\
+    modem.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}-modem \
+"
diff --git a/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb b/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb
new file mode 100644
index 000000000..1a0196b0d
--- /dev/null
+++ b/recipes-bsp/firmware/firmware-qcom-rb3gen2.bb
@@ -0,0 +1,22 @@
+# 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.
+
+DESCRIPTION = "QCOM Firmware for Rb3Gen2 board"
+
+LICENSE = "CLOSED"
+
+FW_QCOM_NAME = "qcs6490"
+
+FW_QCOM_LIST = "\
+    modem.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}-modem \
+"
diff --git a/recipes-bsp/packagegroups/packagegroup-qcm6490-idp.bb b/recipes-bsp/packagegroups/packagegroup-qcm6490-idp.bb
index f7f691dee..0569c5746 100644
--- a/recipes-bsp/packagegroups/packagegroup-qcm6490-idp.bb
+++ b/recipes-bsp/packagegroups/packagegroup-qcm6490-idp.bb
@@ -16,6 +16,7 @@ RRECOMMENDS:${PN}-firmware = " \
     linux-firmware-qcom-qcm6490-audio \
     linux-firmware-qcom-qcm6490-compute \
     linux-firmware-qcom-qcm6490-ipa \
+    linux-firmware-qcom-qcm6490-modem \
     linux-firmware-qcom-qcm6490-qupv3fw \
     linux-firmware-qcom-vpu \
 "
diff --git a/recipes-bsp/packagegroups/packagegroup-rb3gen2.bb b/recipes-bsp/packagegroups/packagegroup-rb3gen2.bb
index ba2a2df0b..b375b9580 100644
--- a/recipes-bsp/packagegroups/packagegroup-rb3gen2.bb
+++ b/recipes-bsp/packagegroups/packagegroup-rb3gen2.bb
@@ -21,6 +21,7 @@ RRECOMMENDS:${PN}-firmware = " \
     linux-firmware-qcom-qcm6490-audio \
     linux-firmware-qcom-qcm6490-compute \
     linux-firmware-qcom-qcm6490-qupv3fw \
+    linux-firmware-qcom-qcs6490-modem \
     linux-firmware-qcom-vpu \
 "