diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_6.0.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_6.0.bb
deleted file mode 100644
index c924c19ad..000000000
--- a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_6.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-
-require recipes-bsp/firmware-imx/firmware-imx.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a"
-
-SRC_URI[md5sum] = "088fb08b565748b537f6481b1ad6c9d7"
-SRC_URI[sha256sum] = "9fa7c204a6ff8a30f2b5e8f9002d8c5736791e455dc137b952fa725dc0c3aeb8"
-
-#BRCM firmware git
-SRCREV = "951c1363abe95dd75ab3e9447f640d7807240236"
-
-COMPATIBLE_MACHINE = "(ccimx6)"
diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.1.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.1.bb
new file mode 100644
index 000000000..b69cdfcf0
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.1.bb
@@ -0,0 +1,54 @@
+# Copyright 2017 NXP
+
+require recipes-bsp/firmware-imx/firmware-imx.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+
+#BRCM firmware v1.141.100.6
+IMX_FIRMWARE_SRC ?= "git://git.freescale.com/proprietary/imx-firmware.git;protocol=git"
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
+           ${IMX_FIRMWARE_SRC};branch=${SRCBRANCH};destsuffix=${S}/git "
+
+SRC_URI[md5sum] = "dbe47f76676fdb2d94c2347ffaa4b03d"
+SRC_URI[sha256sum] = "c315488183768d1a5efa467b30e35a6e7de514023afa9a2c4f572ce3f68c6ed1"
+
+#BRCM firmware git
+SRCREV = "8ce9046f5058fdd2c5271f86ccfc61bc5a248ae3"
+
+do_install_append() {
+    # No need to do install for ddr & hdmi binaries
+    if [ -d ${D}${base_libdir}/firmware/ddr ]; then
+        rm -rf ${D}${base_libdir}/firmware/ddr
+    fi
+    if [ -d ${D}${base_libdir}/firmware/hdmi ]; then
+        rm -rf ${D}${base_libdir}/firmware/hdmi
+    fi
+
+    # Don't install hifi4 related binary
+    if [ -d ${D}${base_libdir}/firmware/hifi4 ]; then
+        rm -rf ${D}${base_libdir}/firmware/hifi4
+    fi
+
+    #1FD_BCM89359
+    install -d ${D}${base_libdir}/firmware/bcm/1FD_BCM89359
+    cp -rfv git/brcm/1FD_BCM89359/*.bin ${D}${base_libdir}/firmware/bcm/1FD_BCM89359
+    cp -rfv git/brcm/1FD_BCM89359/*.hcd ${D}${sysconfdir}/firmware/
+
+    #1CX_BCM4356
+    install -d ${D}${base_libdir}/firmware/bcm/1CX_BCM4356
+    cp -rfv git/brcm/1CX_BCM4356/fw_bcmdhd.bin ${D}${base_libdir}/firmware/bcm/1CX_BCM4356
+}
+
+IS_8MQ = "0"
+IS_8MQ_mx8mq = "1"
+inherit deploy
+addtask deploy before do_build after do_install
+do_deploy () {
+    #
+    if [ "${IS_8MQ}" = "1" ]; then
+        # Deploy ddr/synopsys
+        install -m 0644 ${S}/firmware/ddr/synopsys/lpddr4_pmu_train_*.bin ${DEPLOYDIR}
+
+        # Deploy hdmi/cadence
+        install -m 0644 ${S}/firmware/hdmi/cadence/hdmi_imx8m.bin ${DEPLOYDIR}
+    fi
+}