diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch
index d5467c928..6487ea4ca 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot/0001-iMX8QX-remove-SC_BD_FLAGS_ALT_CONFIG-flag-in-flash_r.patch
@@ -17,15 +17,15 @@ Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/iMX8QX/soc.mak b/iMX8QX/soc.mak
-index 3c8e7b1..f06ece8 100755
+index e08cf3c..88f990a 100755
 --- a/iMX8QX/soc.mak
 +++ b/iMX8QX/soc.mak
-@@ -114,7 +114,7 @@ flash_linux_m4_xip: $(MKIMG) mx8qx-ahab-container.img scfw_tcm.bin u-boot-atf-co
+@@ -120,7 +120,7 @@ flash_linux_m4_xip: $(MKIMG) $(AHAB_IMG) scfw_tcm.bin u-boot-atf-container.img m
  	./$(QSPI_PACKER) $(QSPI_HEADER)
  
- flash_regression_linux_m4: $(MKIMG) mx8qx-ahab-container.img scfw_tcm.bin u-boot-atf.bin m4_image.bin
--	./$(MKIMG) -soc QX -rev B0 -append mx8qx-ahab-container.img -c -flags 0x00200000 -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -p3 -m4 m4_image.bin 0 0x34FE0000 -out flash.bin
-+	./$(MKIMG) -soc QX -rev B0 -append mx8qx-ahab-container.img -c -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -m4 m4_image.bin 0 0x34FE0000 -out flash.bin
+ flash_regression_linux_m4: $(MKIMG) $(AHAB_IMG) scfw_tcm.bin u-boot-atf.bin m4_image.bin
+-	./$(MKIMG) -soc QX -rev B0 -append $(AHAB_IMG) -c -flags 0x00200000 -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -p3 -m4 m4_image.bin 0 0x34FE0000 -out flash.bin
++	./$(MKIMG) -soc QX -rev B0 -append $(AHAB_IMG) -c -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -m4 m4_image.bin 0 0x34FE0000 -out flash.bin
  
- flash_regression_linux_m4_ddr: $(MKIMG) mx8qx-ahab-container.img scfw_tcm.bin u-boot-atf.bin m4_image.bin
- 	./$(MKIMG) -soc QX -rev B0 -append mx8qx-ahab-container.img -c -flags 0x00200000 -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -p3 -m4 m4_image.bin 0 0x88000000 -out flash.bin
+ flash_regression_linux_m4_ddr: $(MKIMG) $(AHAB_IMG) scfw_tcm.bin u-boot-atf.bin m4_image.bin
+ 	./$(MKIMG) -soc QX -rev B0 -append $(AHAB_IMG) -c -flags 0x00200000 -scfw scfw_tcm.bin -ap u-boot-atf.bin a35 0x80000000 -p3 -m4 m4_image.bin 0 0x88000000 -out flash.bin
diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
index 23f467b14..bee090679 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
@@ -1,4 +1,4 @@
-# Copyright 2019 Digi International, Inc.
+# Copyright 2019,2020 Digi International, Inc.
 inherit boot-artifacts
 
 # Use the v4.14 latest BSP branch
@@ -39,6 +39,12 @@ do_populate_lic[depends] += " \
 ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qx.bin"
 ATF_MACHINE_NAME_mx8mn = "bl31-imx8mn.bin"
 
+SECO_FIRMWARE ?= ""
+SECO_FIRMWARE_mx8qm  = "mx8qmb0-ahab-container.img"
+SECO_FIRMWARE_mx8qxp = "mx8qxb0-ahab-container.img"
+# i.MX8QXP C0 support
+#SECO_FIRMWARE_mx8qxp = "mx8qxc0-ahab-container.img"
+
 # 8MQ/8MM/8MN share the same soc folder
 BOOT_STAGING_mx8mn = "${S}/iMX8M"
 
@@ -51,9 +57,9 @@ IMXBOOT_TARGETS_ccimx8mn = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_
 
 compile_mx8x() {
 	bbnote 8QX boot binary build
-	cp ${DEPLOY_DIR_IMAGE}/imx8qx_m4_TCM_srtm_demo.bin       ${BOOT_STAGING}/m40_tcm.bin
-	cp ${DEPLOY_DIR_IMAGE}/imx8qx_m4_TCM_srtm_demo.bin       ${BOOT_STAGING}/m4_image.bin
-	cp ${DEPLOY_DIR_IMAGE}/mx8qx-ahab-container.img          ${BOOT_STAGING}/
+	cp ${DEPLOY_DIR_IMAGE}/imx8qx_m4_TCM_power_mode_switch.bin       ${BOOT_STAGING}/m40_tcm.bin
+	cp ${DEPLOY_DIR_IMAGE}/imx8qx_m4_TCM_power_mode_switch.bin       ${BOOT_STAGING}/m4_image.bin
+	cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE}          ${BOOT_STAGING}/
 	cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
 	for type in ${UBOOT_CONFIG}; do
 		cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-${type}.bin           ${BOOT_STAGING}/
@@ -94,6 +100,8 @@ do_compile () {
 				    for target in ${IMXBOOT_TARGETS}; do
 					    bbnote "building ${SOC_TARGET} - ${ramc} - ${target}"
 					    make SOC=${SOC_TARGET} ${target}
+					    # i.MX8QXP C0 support
+					    #make SOC=${SOC_TARGET} REV=C0 ${target}
 					    if [ -e "${BOOT_STAGING}/flash.bin" ]; then
 						    cp ${BOOT_STAGING}/flash.bin ${S}/${UBOOT_PREFIX}-${MACHINE}-${ramc}.bin-${target}
 					    fi
@@ -147,7 +155,7 @@ do_deploy () {
 
 	# copy the tool mkimage to deploy path and sc fw, dcd and uboot
 	if [ "${SOC_TARGET}" = "iMX8QX" ]; then
-		install -m 0644 ${BOOT_STAGING}/mx8qx-ahab-container.img ${DEPLOYDIR}/${BOOT_TOOLS}
+		install -m 0644 ${BOOT_STAGING}/${SECO_FIRMWARE} ${DEPLOYDIR}/${BOOT_TOOLS}
 		install -m 0644 ${BOOT_STAGING}/m40_tcm.bin              ${DEPLOYDIR}/${BOOT_TOOLS}
 		install -m 0644 ${BOOT_STAGING}/m4_image.bin             ${DEPLOYDIR}/${BOOT_TOOLS}
 	fi
diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
index 110a95c8e..079e27b22 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
@@ -1,5 +1,5 @@
-# Copyright (C) 2018,2019 Digi International, Inc.
+# Copyright (C) 2018-2020 Digi International, Inc.
 
 # Use the v4.14 ga BSP branch
-SRCBRANCH = "imx_4.14.98_2.2.0"
-SRCREV = "c00cd78d2e80178171d2d7f8d0d1ce6e2ea41ac5"
+SRCBRANCH = "imx_4.14.98_2.3.0"
+SRCREV = "2556000499f667123094af22326cfd8e4cbadaac"