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.
diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index ca61086b9..3fe3696c3 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.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 ab9379155..31871ce18 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.dtbo \
     digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
     digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
     digi/_ov_board_v1-v2_ccimx8mn-dvk.dtbo \
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}"
 
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"
 
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..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"
 
@@ -214,6 +218,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
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
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"
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"
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 \
   "