From b35809b19441e8fba5a7723573371a1db5cb4b6a Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Wed, 25 Jul 2018 13:05:42 +0200
Subject: [PATCH] firmware-imx: update to version 7.6

This adds and AHAB container to the QXP binaries, although according to the
makefiles in the mkimage package, it isn't used in the A0 revision of the CPU.

https://jira.digi.com/browse/DEL-6085

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../firmware-imx/firmware-imx_7.1.bb          | 54 --------------
 .../firmware-imx/firmware-imx_7.6.bb          | 70 +++++++++++++++++++
 2 files changed, 70 insertions(+), 54 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.1.bb
 create mode 100644 meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.6.bb

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
deleted file mode 100644
index b69cdfcf0..000000000
--- a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.1.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-}
diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.6.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.6.bb
new file mode 100644
index 000000000..5e2ad5af3
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_7.6.bb
@@ -0,0 +1,70 @@
+# Copyright 2017-2018 NXP
+
+require recipes-bsp/firmware-imx/firmware-imx.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28"
+
+#BRCM firmware v1.141.100.6
+IMX_FIRMWARE_SRC ?= "git://github.com/NXP/imx-firmware.git;protocol=https"
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
+           ${IMX_FIRMWARE_SRC};branch=${SRCBRANCH};destsuffix=${S}/git "
+
+SRC_URI[md5sum] = "3f6a00c3dfc0693c050bf39824865d28"
+SRC_URI[sha256sum] = "6c1e4d4f33b216f69eb46a6dff7a3e10d722afb694acd412c5398ccc270f8a9c"
+
+#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
+    # Don't install seco related binary
+    if [ -d ${D}${base_libdir}/firmware/seco ]; then
+        rm -rf ${D}${base_libdir}/firmware/seco
+    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_MX8 = "0"
+IS_MX8_mx8mq = "8mq"
+IS_MX8_mx8qm = "8qm"
+IS_MX8_mx8qxp = "8qx"
+inherit deploy
+addtask deploy before do_build after do_install
+do_deploy () {
+    # Deploy i.MX8 related firmware files
+    if [ "${IS_MX8}" = "8mq" ]; then
+        # Deploy ddr/synopsys
+        for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
+            install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
+        done
+
+        # Deploy hdmi/cadence
+        install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR}
+    elif [ "${IS_MX8}" = "8qm" ]; then
+        # Deploy hdmi/cadence
+        install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR}
+        install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR}
+        install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR}
+    elif [ "${IS_MX8}" = "8qx" ]; then
+        # Deploy seco
+        install -m 0644 ${S}/firmware/seco/ahab-container.img ${DEPLOYDIR}
+    fi
+}