From f793c7f4b880f7e0c24fcbb5c0ca1933ce67246d Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 23 Feb 2021 10:45:29 +0100
Subject: [PATCH 01/15] opencv: update opencv git SHA1

The previous SHA1 has been completely removed from NXP's opencv repo, so the
recipe must point to a new revision. Update to the revision used in the
zeus-5.4.47-2.2.0 branch of meta-imx.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-dey/recipes-support/opencv/opencv_4.2.0.imx.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-digi-dey/recipes-support/opencv/opencv_4.2.0.imx.bb b/meta-digi-dey/recipes-support/opencv/opencv_4.2.0.imx.bb
index c1acf3c61..2cd2ba575 100644
--- a/meta-digi-dey/recipes-support/opencv/opencv_4.2.0.imx.bb
+++ b/meta-digi-dey/recipes-support/opencv/opencv_4.2.0.imx.bb
@@ -2,7 +2,7 @@ require recipes-support/opencv/opencv_4.1.0.bb
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=014935351b2df6f3094bf25de8d50ed8"
 
-SRCREV_opencv = "7187501b6bc89e111f4dd5694b58151ca98b7d9a" 
+SRCREV_opencv = "f70f223ea33a62e8d8a03f8a0de33f6b7b2f2bb3"
 SRCREV_contrib = "65abc7090dedc84bbedec4dfd143f0340e52114f"
 SRCREV_extra = "322b475403899abc2411c4fbf68318afa77d3191"
 SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59"

From 1134e4c07c75b8da6015e4b6f9320ae4db47d1e9 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 4 Mar 2021 13:14:13 +0100
Subject: [PATCH 02/15] trustfence-sign-tools: don't encrypt artifacts in
 ccimx8mn/ccimx8mm projects

Attempting to boot encrypted artifacts on these platforms will result in HAB
events caused by CAAM errors. This is due to the CAAM being configured for
non-secure contexts (in regards to Trustzone) while the HAB expects it to be
configured for secure contexts.

For now, only sign artifacts for these platforms even if the project has the
encryption feature enabled.

https://jira.digi.com/browse/DUB-993

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../trustfence-sign-artifact.sh                    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh
index cff9ccf89..9c49347e2 100755
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh
@@ -123,17 +123,11 @@ if [ -z "${CONFIG_RAM_START}" ]; then
 fi
 
 # Get DEK key
-if [ -n "${CONFIG_DEK_PATH}" ]; then
+if [ -n "${CONFIG_DEK_PATH}" ] && [ "${PLATFORM}" != "ccimx8mn" ] && [ "${PLATFORM}" != "ccimx8mm" ]; then
 	if [ ! -f "${CONFIG_DEK_PATH}" ]; then
-		if [ "${PLATFORM}" = "ccimx8mn" ] || [ "${PLATFORM}" = "ccimx8mm" ]; then
-			echo "DEK not found. Generating random 128 bit DEK."
-			[ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH})
-			dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=16 count=1 >/dev/null 2>&1
-		else
-			echo "DEK not found. Generating random 256 bit DEK."
-			[ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH})
-			dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=32 count=1 >/dev/null 2>&1
-		fi
+		echo "DEK not found. Generating random 256 bit DEK."
+		[ -d $(dirname ${CONFIG_DEK_PATH}) ] || mkdir -p $(dirname ${CONFIG_DEK_PATH})
+		dd if=/dev/urandom of="${CONFIG_DEK_PATH}" bs=32 count=1 >/dev/null 2>&1
 	fi
 	dek_size="$((8 * $(stat -L -c %s ${CONFIG_DEK_PATH})))"
 	if [ "${dek_size}" != "128" ] && [ "${dek_size}" != "192" ] && [ "${dek_size}" != "256" ]; then

From 8dc46fcaf8269d6194860760f31f9c7ddcd30e2d Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 8 Mar 2021 10:35:46 +0100
Subject: [PATCH 03/15] imx-boot: export SRK revocation config when signing
 i.MX8M imx-boot images

There's a Yocto configuration option that enables this feature in U-Boot, but
since imx-boot images are signed using the scripts in trustfence-sign-tools,
said configuration is lost and the scripts don't take it into account if it's
enabled. Make sure that the configuation carries over to the script.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index a0408703f..893a5b4cd 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -214,6 +214,7 @@ do_deploy_append () {
 		[ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}"
 		[ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}"
 		[ -n "${TRUSTFENCE_SRK_REVOKE_MASK}" ] && export SRK_REVOKE_MASK="${TRUSTFENCE_SRK_REVOKE_MASK}"
+		[ -n "${TRUSTFENCE_UNLOCK_KEY_REVOCATION}" ] && export CONFIG_UNLOCK_SRK_REVOKE="${TRUSTFENCE_UNLOCK_KEY_REVOCATION}"
 
 		# Sign U-boot image
 		if [ "${UBOOT_RAM_COMBINATIONS}" = "" ]; then

From eb9ec09fa4446b72331a8d273370427bfae97043 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 8 Mar 2021 16:29:04 +0100
Subject: [PATCH 04/15] meta-digi: prepare for dey-3.0-r4.1

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 README.md | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 97a8bb3d0..30d96913b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Digi Embedded Yocto (DEY) 3.0
-## Release 3.0-r3
+## Release 3.0-r4
 
 This document provides information about Digi Embedded Yocto,
 Digi International's professional embedded Yocto development environment.
@@ -20,6 +20,12 @@ OS versions:
 
 Software for the following hardware platforms is in production support:
 
+## ConnectCore 8M Mini
+* ConnectCore 8M Mini System-on-Module (SOM)
+  * [CC-WMX-ET8D-NN](https://www.digi.com/cc8mmini)
+* ConnectCore 8M Mini Development Kit
+  * [CC-WMX8MM-KIT](https://www.digi.com/products/models/cc-wmx8mm-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc8mmini/yocto-gs_index))
+
 ## ConnectCore 8M Nano
 * ConnectCore 8M Nano System-on-Module (SOM)
   * [CC-WMX-FS7D-NN](https://www.digi.com/cc8mnano)
@@ -93,18 +99,28 @@ Documentation is available online at https://www.digi.com/resources/documentatio
 
 # Downloads
 
-* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/3.0/r3/images/
-* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/3.0/r3/sdk/
+* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/3.0/r4/images/
+* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/3.0/r4/sdk/
 
 # Release Changelog
 
+## 3.0-r4
+
+* Added support for ConnectCore 8M platform
+* Updated BSP to NXP release rel_imx_5.4.70_2.3.1.
+* Updated U-Boot to version 2020.04-r3 for ConnectCore 6UL, ConnectCore 8M Nano,
+  ConnectCore 8M Mini and ConnectCore 8X.
+* Updated i.MX8 SCU firmware to v1.7.1
+* Other minor fixes.
+
+
 ## 3.0-r3
 
 * Updated BSP to NXP release rel_imx_5.4.47_2.2.0.
 * Updated U-Boot to version 2020.04-r2 for ConnectCore 6UL, ConnectCore 8M Nano
   and ConnectCore 8X.
-* TrustFence: add support for encrypted artifacts on ConnectCore 8M Nano and
-  ConnectCore 8X.
+* TrustFence: add support for encrypted artifacts on
+  ~~Connect Core 8M Nano and ~~ ConnectCore 8X.
 * TrustFence: add support for SRK revocation on ConnectCore 8X.
 * Added support to install firmware from a USB stick.
 * Added WebKit image recipe to platforms with XWayland backend.

From 7728d5f458c8f0856d3a2f377476c51117d76d23 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 8 Mar 2021 16:52:02 +0100
Subject: [PATCH 05/15] meta-digi: update revisions for dey-3.0-r4.1

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc              | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb        | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb        | 2 +-
 .../recipes-digi/trustfence/trustfence-sign-tools_git.bb      | 4 ++--
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb          | 4 ++--
 meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc          | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_git.bb         | 4 ++--
 meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc  | 4 ++--
 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb     | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index 0a880edb3..c6ebaf974 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}"
 
 SRC_URI = " \
-    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
+    ${UBOOT_GIT_URI};nobranch=1 \
 "
 
 SRC_URI_append = " \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
index 2c87e3e5f..79a6917db 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
@@ -3,6 +3,6 @@
 require digi-u-boot.inc
 
 SRCBRANCH = "v2017.03/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "73b1ab4b7a8f8433e56f8fc995001c84458deb11"
 
 COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
index 94b7ce03c..df0be26d9 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 DEPENDS += "flex-native bison-native"
 
 SRCBRANCH = "v2020.04/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "749d90196c7d28cb6995d9ab5141d97b9079735d"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
index 97cee424b..33e0299fb 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux"
 DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}"
 
 SRCBRANCH = "v2020.04/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "749d90196c7d28cb6995d9ab5141d97b9079735d"
 
 S = "${WORKDIR}"
 
@@ -15,7 +15,7 @@ S = "${WORKDIR}"
 UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}"
 
 SRC_URI = " \
-    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
+    ${UBOOT_GIT_URI};nobranch=1 \
     file://trustfence-sign-artifact.sh;name=artifact-sign-script \
     file://sign_hab;name=artifact-hab-sign \
     file://encrypt_hab;name=artifact-hab-encrypt \
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index 4437359c9..9707f0eb1 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 PV = "v4.0.11.213X"
 
 SRCBRANCH = "qca65X4/dey-3.0/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "91e14026ec7699446cab227ac38034ee35bc64d6"
 
 QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}"
 
 SRC_URI = " \
-    ${QCOM_GIT_URI};branch=${SRCBRANCH} \
+    ${QCOM_GIT_URI};nobranch=1 \
 "
 
 # Selects whether the interface is SDIO or PCI
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index cd651d8a4..5654cff37 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 LOCALVERSION = "-dey"
 SRCBRANCH = "v5.4/dey-3.0/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "6f752f9e395c0a1b5d6ece4e84bfd72bbd3dc443"
 
 # Select internal or Github Linux repo
 LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}"
-SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = "${LINUX_GIT_URI};nobranch=1"
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index d5501cdd7..b2dc3ddfd 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 DEPENDS = "confuse openssl recovery-utils zlib"
 
 SRCBRANCH = "master"
-SRCREV = "${AUTOREV}"
+SRCREV = "244c0a7aa753dc7bdd7385700a755720dfd09f9e"
 
 CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh"
 CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
-SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = "${CC_GIT_URI};nobranch=1"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
index ad2c625b6..fa1b43887 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
@@ -1,11 +1,11 @@
 # Copyright (C) 2019-2021 Digi International Inc.
 
 SRCBRANCH = "dey-3.0/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "ada1185ac67f0e73e0d7f74780484ca95c3f7a5d"
 
 DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https"
 
 DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}"
 
-SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1"
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
index 4c200046a..6fdd90750 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 DEPENDS = "libsoc libsocketcan libgpiod"
 
 SRCBRANCH ?= "dey-3.0/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "8989ca6609ece6c1c53657141f0b2da08ff6e3d5"
 
 LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh"
 LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https"
@@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https"
 LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \
+    ${LIBDIGIAPIX_GIT_URI};nobranch=1 \
     file://99-digiapix.rules \
     file://libdigiapix.conf \
     file://digiapix.sh \

From 4c9546357d4570b788271b2c82188115be35b8f2 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 8 Mar 2021 18:07:27 +0100
Subject: [PATCH 06/15] meta-digi: revert revisions to AUTOREV

This reverts commit 7728d5f458c8f0856d3a2f377476c51117d76d23.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc              | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb        | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb        | 2 +-
 .../recipes-digi/trustfence/trustfence-sign-tools_git.bb      | 4 ++--
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb          | 4 ++--
 meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc          | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_git.bb         | 4 ++--
 meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc  | 4 ++--
 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb     | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index c6ebaf974..0a880edb3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}"
 
 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
 "
 
 SRC_URI_append = " \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
index 79a6917db..2c87e3e5f 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
@@ -3,6 +3,6 @@
 require digi-u-boot.inc
 
 SRCBRANCH = "v2017.03/maint"
-SRCREV = "73b1ab4b7a8f8433e56f8fc995001c84458deb11"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
index df0be26d9..94b7ce03c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 DEPENDS += "flex-native bison-native"
 
 SRCBRANCH = "v2020.04/maint"
-SRCREV = "749d90196c7d28cb6995d9ab5141d97b9079735d"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
index 33e0299fb..97cee424b 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux"
 DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}"
 
 SRCBRANCH = "v2020.04/maint"
-SRCREV = "749d90196c7d28cb6995d9ab5141d97b9079735d"
+SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
 
@@ -15,7 +15,7 @@ S = "${WORKDIR}"
 UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}"
 
 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
     file://trustfence-sign-artifact.sh;name=artifact-sign-script \
     file://sign_hab;name=artifact-hab-sign \
     file://encrypt_hab;name=artifact-hab-encrypt \
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index 9707f0eb1..4437359c9 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 PV = "v4.0.11.213X"
 
 SRCBRANCH = "qca65X4/dey-3.0/maint"
-SRCREV = "91e14026ec7699446cab227ac38034ee35bc64d6"
+SRCREV = "${AUTOREV}"
 
 QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}"
 
 SRC_URI = " \
-    ${QCOM_GIT_URI};nobranch=1 \
+    ${QCOM_GIT_URI};branch=${SRCBRANCH} \
 "
 
 # Selects whether the interface is SDIO or PCI
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index 5654cff37..cd651d8a4 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 LOCALVERSION = "-dey"
 SRCBRANCH = "v5.4/dey-3.0/maint"
-SRCREV = "6f752f9e395c0a1b5d6ece4e84bfd72bbd3dc443"
+SRCREV = "${AUTOREV}"
 
 # Select internal or Github Linux repo
 LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}"
-SRC_URI = "${LINUX_GIT_URI};nobranch=1"
+SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index b2dc3ddfd..d5501cdd7 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 DEPENDS = "confuse openssl recovery-utils zlib"
 
 SRCBRANCH = "master"
-SRCREV = "244c0a7aa753dc7bdd7385700a755720dfd09f9e"
+SRCREV = "${AUTOREV}"
 
 CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh"
 CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
-SRC_URI = "${CC_GIT_URI};nobranch=1"
+SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
index fa1b43887..ad2c625b6 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
@@ -1,11 +1,11 @@
 # Copyright (C) 2019-2021 Digi International Inc.
 
 SRCBRANCH = "dey-3.0/maint"
-SRCREV = "ada1185ac67f0e73e0d7f74780484ca95c3f7a5d"
+SRCREV = "${AUTOREV}"
 
 DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https"
 
 DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}"
 
-SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1"
+SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}"
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
index 6fdd90750..4c200046a 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 DEPENDS = "libsoc libsocketcan libgpiod"
 
 SRCBRANCH ?= "dey-3.0/maint"
-SRCREV = "8989ca6609ece6c1c53657141f0b2da08ff6e3d5"
+SRCREV = "${AUTOREV}"
 
 LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh"
 LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https"
@@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https"
 LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${LIBDIGIAPIX_GIT_URI};nobranch=1 \
+    ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \
     file://99-digiapix.rules \
     file://libdigiapix.conf \
     file://digiapix.sh \

From 74aceb29541cbf6da752881dabad67de4855bc14 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Tue, 16 Mar 2021 11:14:04 +0100
Subject: [PATCH 07/15] machine: ccimx8mn/8mm: add DT overlay for Fusion 10"
 LCD

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 1 +
 meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index ca61086b9..d61064c80 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -21,6 +21,7 @@ UBOOT_DTB_NAME = "ccimx8mm-dvk.dtb"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mm-dvk.dtb \
+    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dts \
     digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
     digi/_ov_som_bt_ccimx8m.dtbo \
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index ab9379155..0f6be0cc7 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -21,6 +21,7 @@ UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mn-dvk.dtb \
+    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dts \
     digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
     digi/_ov_board_v1-v2_ccimx8mn-dvk.dtbo \

From 2df009e6a7d01a4d5157220ded4398473746a4a4 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Tue, 23 Mar 2021 10:35:02 +0100
Subject: [PATCH 08/15] machine: ccimx8mm/8mn: fix typo on device tree overlay
 extension

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 2 +-
 meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index d61064c80..3fe3696c3 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -21,7 +21,7 @@ UBOOT_DTB_NAME = "ccimx8mm-dvk.dtb"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mm-dvk.dtb \
-    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dts \
+    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
     digi/_ov_som_bt_ccimx8m.dtbo \
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index 0f6be0cc7..31871ce18 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -21,7 +21,7 @@ UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mn-dvk.dtb \
-    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dts \
+    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
     digi/_ov_board_v1-v2_ccimx8mn-dvk.dtbo \

From be13e54864e06217f960b605c80d11dfdcac409e Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Wed, 10 Mar 2021 16:21:26 +0100
Subject: [PATCH 09/15] recipes-devtools: add stb recipe from meta-imx

Even though this recipe is part of NXP's meta-sdk layer instead of the meta-ml
one, it's required to build some of the machine learning packages.

https://jira.digi.com/browse/DEL-7473
https://jira.digi.com/browse/DEL-7484

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-dey/recipes-devtools/stb/stb_git.bb | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta-digi-dey/recipes-devtools/stb/stb_git.bb

diff --git a/meta-digi-dey/recipes-devtools/stb/stb_git.bb b/meta-digi-dey/recipes-devtools/stb/stb_git.bb
new file mode 100644
index 000000000..17da929b3
--- /dev/null
+++ b/meta-digi-dey/recipes-devtools/stb/stb_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "single-file public domain (or MIT licensed) libraries for C/C++"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://stb.h;beginline=14418;endline=14433;md5=b10975d4c8155af1811ab611586f01d2"
+
+PV = "0.0+git${SRCPV}"
+
+SRCREV = "f67165c2bb2af3060ecae7d20d6f731173485ad0"
+SRC_URI = "git://github.com/nothings/stb.git"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+    install -d ${D}${includedir}
+    for hdr in ${S}/*.h; do
+        install -m 0644 $hdr ${D}${includedir}
+    done
+}
+
+# This is a header-only library, so the main package will be empty.
+ALLOW_EMPTY_${PN} = "1"

From a937b9ce5e84472f6cbd10391a1a9bc72f748e8d Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Wed, 10 Mar 2021 16:34:19 +0100
Subject: [PATCH 10/15] recipes-security: add ml-security recipe from meta-imx

This package isn't essential for NXP's machine learning functionality, but it
provides additional security against possible attacks related to machine
learning.

https://jira.digi.com/browse/DEL-7473
https://jira.digi.com/browse/DEL-7484

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../ml-security/ml-security_1.0.3.bb          | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-digi-dey/recipes-security/ml-security/ml-security_1.0.3.bb

diff --git a/meta-digi-dey/recipes-security/ml-security/ml-security_1.0.3.bb b/meta-digi-dey/recipes-security/ml-security/ml-security_1.0.3.bb
new file mode 100644
index 000000000..4119c4819
--- /dev/null
+++ b/meta-digi-dey/recipes-security/ml-security/ml-security_1.0.3.bb
@@ -0,0 +1,21 @@
+# Copyright 2019-2020 NXP
+
+DESCRIPTION = "Hardening Library for Machine Learning Security"
+SECTION = "security"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
+
+DEPENDS = "opencv"
+
+SRC_URI[md5sum] = "933fc6fd993d0558128364787d459ed5"
+SRC_URI[sha256sum] = "2c4aa7982f5dee49ff15cd63a236c17f513c01506c2faf6a5a4ca1b3140c7bba"
+
+S = "${WORKDIR}/ml-security"
+
+inherit fsl-eula2-unpack2
+
+FILES_${PN} += " \
+    ${datadir}/ml-security/examples/* \
+"
+
+RDEPENDS_${PN} = "bash"

From 2abeb37d1f48f93ae4e2e0319c6ce281a834c5f3 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 11 Mar 2021 14:24:55 +0100
Subject: [PATCH 11/15] bblayes.conf.sample: add meta-ml layer to i.MX8
 platforms

This layer contains all of NXP's recipes needed for machine learning/eIQ
support on i.MX8 platforms.

https://jira.digi.com/browse/DEL-7473
https://jira.digi.com/browse/DEL-7484

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 sdk/config/ccimx8mm-dvk/bblayers.conf.sample    | 1 +
 sdk/config/ccimx8mn-dvk/bblayers.conf.sample    | 1 +
 sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sdk/config/ccimx8mm-dvk/bblayers.conf.sample b/sdk/config/ccimx8mm-dvk/bblayers.conf.sample
index 68d2495bf..94458739a 100644
--- a/sdk/config/ccimx8mm-dvk/bblayers.conf.sample
+++ b/sdk/config/ccimx8mm-dvk/bblayers.conf.sample
@@ -19,6 +19,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-python2 \
   ##DIGIBASE##/meta-webkit \
+  ##DIGIBASE##/meta-imx/meta-ml \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
   "
diff --git a/sdk/config/ccimx8mn-dvk/bblayers.conf.sample b/sdk/config/ccimx8mn-dvk/bblayers.conf.sample
index 68d2495bf..94458739a 100644
--- a/sdk/config/ccimx8mn-dvk/bblayers.conf.sample
+++ b/sdk/config/ccimx8mn-dvk/bblayers.conf.sample
@@ -19,6 +19,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-python2 \
   ##DIGIBASE##/meta-webkit \
+  ##DIGIBASE##/meta-imx/meta-ml \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
   "
diff --git a/sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample b/sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample
index b639b6828..61a57e34b 100644
--- a/sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample
+++ b/sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample
@@ -18,6 +18,7 @@ BBLAYERS ?= " \
   ##DIGIBASE##/meta-freescale \
   ##DIGIBASE##/meta-fsl-demos \
   ##DIGIBASE##/meta-webkit \
+  ##DIGIBASE##/meta-imx/meta-ml \
   ##DIGIBASE##/meta-digi/meta-digi-arm \
   ##DIGIBASE##/meta-digi/meta-digi-dey \
   "

From 84104cd0b6e7c523c89436b76d1d9ed09de9c321 Mon Sep 17 00:00:00 2001
From: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
Date: Tue, 6 Apr 2021 08:59:34 +0200
Subject: [PATCH 12/15] firmware_qualcomm: ccimx8m: update US Board Data File
 calibration

Update file:

- bdwlan30_US.bin (93a58f0f8e241bef6600d53d013c3cb2)

  This file was generated by calibrating several v3 CC8MN SOMs and
  merging their resulting BDF files into a new Golden file.
  Target output powers tables and CTL tables remain intact.

Reference calibration file is obtained from 'qca6574au-le-2-2-2_qca_oem' repo
at tag 'r00005.1' under path
'wlanfw/cnss_proc/wlan/fw/target/sdio_dst/qc6174/bdwlan30.bin':

- bdwlan30.bin (8a40d95698825e1718bee640b1f7982a)

Target output powers respect the maximum EVM for every data rate.
CTL limits comply with FCC, CE and TELEC certifications.

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

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
(cherry picked from commit cceffef831edd10b017aac3006636c98f7baa0a9)
---
 .../firmware-qualcomm/ccimx8m/bdwlan30_US.bin | Bin 8124 -> 8124 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8m/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8m/bdwlan30_US.bin
index 402a1d22cfba4318b073d841fb768f4c1f65788b..937dd551120cfc741bef878e43cec652dc24f9da 100644
GIT binary patch
delta 2656
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
QkIbJeSSxRTagzP?zdR+aO8@`>

delta 2656
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
P#;=~4&)<J@jePz;nhK<e


From c74360a5c4bdebfb7b6c32269acfd7fa1b2cabb9 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 13 Apr 2021 16:35:44 +0200
Subject: [PATCH 13/15] imx-boot: add M4 demos to ConnectCore 8M Mini platform

Include in the deploy folder the M4 demos for the ConnectCore 8M Mini platform

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index 893a5b4cd..d2dab4717 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -8,6 +8,10 @@ IMX_EXTRA_FIRMWARE_ccimx8x = "digi-sc-firmware imx-seco"
 DEPENDS_append_ccimx8x = " coreutils-native"
 DEPENDS_append_mx8 += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
 
+IMX_M4_DEMOS_mx8mm   = "imx-m4-demos:do_deploy"
+
+M4_DEFAULT_IMAGE_mx8mm = "imx8mm_m4_TCM_hello_world.bin"
+
 IMX_M7_DEMOS        = ""
 IMX_M7_DEMOS_mx8mn  = "imx-m7-demos:do_deploy"
 

From f1aebd1c8a22e8f9eafe960f0b62ed26a6a02a6a Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 16 Apr 2021 15:45:25 +0200
Subject: [PATCH 14/15] imx-atf: rework patches to disable Cortex-M debug
 console

Add a patch series to customize the ATF console for the ConnectCore 8M platforms,
and to disable the Cortex-M debug UART.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 ...fine-UART1-as-console-for-boot-stage.patch | 46 ++++++++++++++++
 ...0001-imx8mm-Disable-M4-debug-console.patch | 54 -------------------
 ...fine-UART1-as-console-for-boot-stage.patch | 46 ++++++++++++++++
 ...0001-imx8mn-Disable-M7-debug-console.patch | 50 -----------------
 ...0002-imx8mm-Disable-M4-debug-console.patch | 30 +++++++++++
 ...0002-imx8mn-Disable-M7-debug-console.patch | 30 +++++++++++
 .../recipes-bsp/imx-atf/imx-atf_2.2.bb        |  6 ++-
 7 files changed, 156 insertions(+), 106 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch
 delete mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Disable-M4-debug-console.patch
 create mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch
 delete mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Disable-M7-debug-console.patch
 create mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mm-Disable-M4-debug-console.patch
 create mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mn-Disable-M7-debug-console.patch

diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch
new file mode 100644
index 000000000..3a81dbc77
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch
@@ -0,0 +1,46 @@
+From: Arturo Buzarra <arturo.buzarra@digi.com>
+Date: Fri, 16 Apr 2021 15:03:31 +0200
+Subject: [PATCH] imx8mm: Define UART1 as console for boot stage
+
+UART1 is the default console for ConnectCore i.MX8M Mini
+
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
+---
+ plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c    | 2 +-
+ plat/imx/imx8m/imx8mm/include/platform_def.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+index 049192880..e16b72eb2 100644
+--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+@@ -57,11 +57,11 @@ static const struct imx_rdc_cfg rdc[] = {
+ 	/* Master domain assignment */
+ 	RDC_MDAn(RDC_MDA_M4, DID1),
+
+ 	/* peripherals domain permission */
+ 	RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
+-	RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
++	RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
+
+ 	/* memory region */
+
+ 	/* Sentinel */
+ 	{0},
+diff --git a/plat/imx/imx8m/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h
+index 42b03613e..b02dd5202 100644
+--- a/plat/imx/imx8m/imx8mm/include/platform_def.h
++++ b/plat/imx/imx8m/imx8mm/include/platform_def.h
+@@ -49,11 +49,11 @@
+ #define MAX_XLAT_TABLES			8
+ #define MAX_MMAP_REGIONS		16
+
+ #define HAB_RVT_BASE			U(0x00000900) /* HAB_RVT for i.MX8MM */
+
+-#define IMX_BOOT_UART_BASE		U(0x30890000)
++#define IMX_BOOT_UART_BASE		U(0x30860000) /* UART1 for ConnectCore i.MX8M Mini */
+ #define IMX_BOOT_UART_CLK_IN_HZ		24000000 /* Select 24MHz oscillator */
+
+ #define PLAT_CRASH_UART_BASE		IMX_BOOT_UART_BASE
+ #define PLAT_CRASH_UART_CLK_IN_HZ	24000000
+ #define IMX_CONSOLE_BAUDRATE		115200
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Disable-M4-debug-console.patch b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Disable-M4-debug-console.patch
deleted file mode 100644
index 3bd59ff96..000000000
--- a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Disable-M4-debug-console.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 32f0fe2d607f165fbf4ab6b5c21b147b68ab46e2 Mon Sep 17 00:00:00 2001
-From: Gabriel Valcazar <gabriel.valcazar@digi.com>
-Date: Fri, 29 Jan 2021 11:21:07 +0100
-Subject: [PATCH] imx8mm: Disable M4 debug console
-
-The Cortex-M4 uses the UART4 as debug console, and it is
-shared with the Cortex-A53.
-
-Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
----
- plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
-index 049192880..f7aada323 100644
---- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
-+++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
-@@ -58,7 +58,7 @@ static const struct imx_rdc_cfg rdc[] = {
- 	RDC_MDAn(RDC_MDA_M4, DID1),
- 
- 	/* peripherals domain permission */
--	RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
-+	/*RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),*/
- 	RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
- 
- 	/* memory region */
-@@ -129,7 +129,7 @@ static void bl31_tzc380_setup(void)
- void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
- 		u_register_t arg2, u_register_t arg3)
- {
--	static console_uart_t console;
-+	/*static console_uart_t console;*/
- 	int i;
- 
- 	/* Enable CSU NS access permission */
-@@ -144,11 +144,11 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
- 	imx_csu_init(csu_cfg);
- 
- 	imx8m_caam_init();
--
--	console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ,
-+	/* Uncomment to use the M4 debug console (shared with A53 UART4) */
-+	/*console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ,
- 		IMX_CONSOLE_BAUDRATE, &console);
--	/* This console is only used for boot stage */
--	console_set_scope(&console.console, CONSOLE_FLAG_BOOT);
-+	 This console is only used for boot stage
-+	console_set_scope(&console.console, CONSOLE_FLAG_BOOT);*/
- 
- 	/*
- 	 * tell BL3-1 where the non-secure software image is located
--- 
-2.17.1
-
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch
new file mode 100644
index 000000000..3cf64d1ab
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch
@@ -0,0 +1,46 @@
+From: Arturo Buzarra <arturo.buzarra@digi.com>
+Date: Fri, 16 Apr 2021 15:38:09 +0200
+Subject: [PATCH] imx8mn: Define UART1 as console for boot stage
+
+UART1 is the default console for ConnectCore i.MX8M Nano
+
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
+---
+ plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c    | 2 +-
+ plat/imx/imx8m/imx8mn/include/platform_def.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+index 841ec5a3a..1bfacb409 100644
+--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+@@ -56,11 +56,11 @@ static const struct imx_rdc_cfg rdc[] = {
+ 	/* Master domain assignment */
+ 	RDC_MDAn(RDC_MDA_M7, DID1),
+
+ 	/* peripherals domain permission */
+ 	RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
+-	RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
++	RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
+
+ 	/* memory region */
+ 	RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff),
+ 	RDC_MEM_REGIONn(17, 0x0, 0x0, 0xff),
+ 	RDC_MEM_REGIONn(18, 0x0, 0x0, 0xff),
+diff --git a/plat/imx/imx8m/imx8mn/include/platform_def.h b/plat/imx/imx8m/imx8mn/include/platform_def.h
+index 967afbbee..6a07be2a8 100644
+--- a/plat/imx/imx8m/imx8mn/include/platform_def.h
++++ b/plat/imx/imx8m/imx8mn/include/platform_def.h
+@@ -49,11 +49,11 @@
+ #define MAX_XLAT_TABLES			8
+ #define MAX_MMAP_REGIONS		16
+
+ #define HAB_RVT_BASE			U(0x00000900) /* HAB_RVT for i.MX8MM */
+
+-#define IMX_BOOT_UART_BASE		U(0x30890000)
++#define IMX_BOOT_UART_BASE		U(0x30860000) /* UART1 for ConnectCore i.MX8M Nano */
+ #define IMX_BOOT_UART_CLK_IN_HZ		24000000 /* Select 24MHz oscillator */
+
+ #define PLAT_CRASH_UART_BASE		IMX_BOOT_UART_BASE
+ #define PLAT_CRASH_UART_CLK_IN_HZ	24000000
+ #define IMX_CONSOLE_BAUDRATE		115200
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Disable-M7-debug-console.patch b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Disable-M7-debug-console.patch
deleted file mode 100644
index 7ef08177a..000000000
--- a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Disable-M7-debug-console.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Mike Engel <Mike.Engel@digi.com>
-Date: Thu, 16 Jul 2020 12:57:59 +0200
-Subject: [PATCH] imx8mn: Disable M7 debug console
-
-The Cortex-M7 uses the UART4 as debug console, and it is
-shared with the Cortex-A53.
-
-Signed-off-by: Mike Engel <Mike.Engel@digi.com>
----
- plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
-index 841ec5a..ae9aeb9 100644
---- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
-+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
-@@ -57,7 +57,7 @@ static const struct imx_rdc_cfg rdc[] = {
- 	RDC_MDAn(RDC_MDA_M7, DID1),
- 
- 	/* peripherals domain permission */
--	RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
-+	/*RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),*/
- 	RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
- 
- 	/* memory region */
-@@ -131,7 +131,7 @@ static void bl31_tzc380_setup(void)
- void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
- 		u_register_t arg2, u_register_t arg3)
- {
--	static console_uart_t console;
-+	/*static console_uart_t console;*/
- 	int i;
- 
- 	/* Enable CSU NS access permission */
-@@ -150,10 +150,11 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
- 
- 	imx8m_caam_init();
- 
--	console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ,
-+	/* Uncomment to use the M7 debug console (shared with A53 UART4) */
-+	/*console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ,
- 		IMX_CONSOLE_BAUDRATE, &console);
--	/* This console is only used for boot stage */
--	console_set_scope(&console.console, CONSOLE_FLAG_BOOT);
-+	 This console is only used for boot stage 
-+	console_set_scope(&console.console, CONSOLE_FLAG_BOOT);*/
- 
- 	/*
- 	 * tell BL3-1 where the non-secure software image is located
--- 
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mm-Disable-M4-debug-console.patch b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mm-Disable-M4-debug-console.patch
new file mode 100644
index 000000000..8553df3b4
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mm-Disable-M4-debug-console.patch
@@ -0,0 +1,30 @@
+From: Gabriel Valcazar <gabriel.valcazar@digi.com>
+Date: Fri, 29 Jan 2021 11:21:07 +0100
+Subject: [PATCH] imx8mm: Disable M4 debug console
+
+The Cortex-M4 uses the UART4 as debug console, and it is
+shared with the Cortex-A53.
+
+Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
+---
+ plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+index e16b72eb2..040f1a75f 100644
+--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+@@ -56,11 +56,11 @@ static const struct aipstz_cfg aipstz[] = {
+ static const struct imx_rdc_cfg rdc[] = {
+ 	/* Master domain assignment */
+ 	RDC_MDAn(RDC_MDA_M4, DID1),
+
+ 	/* peripherals domain permission */
+-	RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
++	/*RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),*/
+ 	RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
+
+ 	/* memory region */
+
+ 	/* Sentinel */
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mn-Disable-M7-debug-console.patch b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mn-Disable-M7-debug-console.patch
new file mode 100644
index 000000000..e63d02a49
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mn-Disable-M7-debug-console.patch
@@ -0,0 +1,30 @@
+From: Mike Engel <Mike.Engel@digi.com>
+Date: Thu, 16 Jul 2020 12:57:59 +0200
+Subject: [PATCH] imx8mn: Disable M7 debug console
+
+The Cortex-M7 uses the UART4 as debug console, and it is
+shared with the Cortex-A53.
+
+Signed-off-by: Mike Engel <Mike.Engel@digi.com>
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
+---
+ plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+index 1bfacb409..768eed26a 100644
+--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+@@ -55,11 +55,11 @@ static const struct aipstz_cfg aipstz[] = {
+ static const struct imx_rdc_cfg rdc[] = {
+ 	/* Master domain assignment */
+ 	RDC_MDAn(RDC_MDA_M7, DID1),
+
+ 	/* peripherals domain permission */
+-	RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
++	/*RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),*/
+ 	RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
+
+ 	/* memory region */
+ 	RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff),
+ 	RDC_MEM_REGIONn(17, 0x0, 0x0, 0xff),
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.2.bb b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.2.bb
index 5d31f2e31..efbcc91e8 100644
--- a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.2.bb
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.2.bb
@@ -13,8 +13,10 @@ SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
 "
 SRCREV = "f1d7187f261ebf4b8a2a70d638d4bfc0a9b26c29"
 
-SRC_URI_append_ccimx8mn = " file://0001-imx8mn-Disable-M7-debug-console.patch"
-SRC_URI_append_ccimx8mm = " file://0001-imx8mm-Disable-M4-debug-console.patch"
+SRC_URI_append_ccimx8mn = " file://0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch \
+                            file://0002-imx8mn-Disable-M7-debug-console.patch"
+SRC_URI_append_ccimx8mm = " file://0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch \
+                            file://0002-imx8mm-Disable-M4-debug-console.patch"
 
 S = "${WORKDIR}/git"
 

From f176ce67f352dd47c8a21ee4cf9ef6c6caf0e786 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Tue, 20 Apr 2021 15:57:33 +0200
Subject: [PATCH 15/15] digi-sc-firmware: update recipe to v1.7.1.1

The new SCFW re-enables "Read DBI deskew configuration"
setting, to support Nanya LPDDR4 chips.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/CC8X-297
---
 ...igi-sc-firmware_1.7.1.bb => digi-sc-firmware_1.7.1.1.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-digi-arm/recipes-bsp/digi-sc-firmware/{digi-sc-firmware_1.7.1.bb => digi-sc-firmware_1.7.1.1.bb} (86%)

diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.7.1.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.7.1.1.bb
similarity index 86%
rename from meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.7.1.bb
rename to meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.7.1.1.bb
index ac05ab565..153078c4a 100644
--- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.7.1.bb
+++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.7.1.1.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2016 Freescale Semiconductor
 # Copyright 2017-2018 NXP
-# Copyright (C) 2018-2020 Digi International.
+# Copyright (C) 2018-2021 Digi International.
 
 DESCRIPTION = "i.MX System Controller Firmware, customized for Digi platforms"
 LICENSE = "Proprietary"
@@ -11,8 +11,8 @@ inherit pkgconfig deploy
 
 SRC_URI = "${DIGI_PKG_SRC}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "79da2ab3833c5969bec9aeb155f50fd3"
-SRC_URI[sha256sum] = "c1d03907a2f0c1c0881a42fef3b5450886542d7b18855b5ab9c021278d727ac7"
+SRC_URI[md5sum] = "64419361dd592b9b9ebfc0d8bc1c6a75"
+SRC_URI[sha256sum] = "38fc97904ad3da3caa62ae2ce1a8fcd036484473a3784117eec55b71201937f3"
 
 S = "${WORKDIR}/${PN}-${PV}"