diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_1.4.1.bb b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_1.5.bb
similarity index 63%
rename from meta-digi-arm/recipes-bsp/imx-atf/imx-atf_1.4.1.bb
rename to meta-digi-arm/recipes-bsp/imx-atf/imx-atf_1.5.bb
index 0b522b02a..6c3d446b4 100644
--- a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_1.4.1.bb
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_1.5.bb
@@ -5,15 +5,15 @@ SECTION = "BSP"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
-inherit pkgconfig deploy
+inherit fsl-eula-unpack pkgconfig deploy
 
-PV = "1.4.1+git${SRCPV}"
+PV = "1.5+git${SRCPV}"
 
 ATF_SRC ?= "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https"
-SRCBRANCH = "imx_4.9.88_imx8qxp_beta2"
+SRCBRANCH = "imx_4.14.78_1.0.0_ga"
 
 SRC_URI = "${ATF_SRC};branch=${SRCBRANCH}"
-SRCREV = "00b653ec4b51a211ae735ffe0d3c9de7a8979947"
+SRCREV = "d6451cc1e162eff89b03dd63e86d55b9baa8885b"
 
 S = "${WORKDIR}/git"
 
@@ -23,10 +23,11 @@ SOC_ATF ?= "imx8qm"
 SOC_ATF_mx8qm = "imx8qm"
 SOC_ATF_mx8qxp = "imx8qxp"
 SOC_ATF_mx8mq = "imx8mq"
+SOC_ATF_mx8mm = "imx8mm"
 
 SYSROOT_DIRS += "/boot"
 
-EXTRA_OEMAKE_append = " ${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'SPD=opteed', '', d)}"
+BUILD_OPTEE = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'true', 'false', d)}"
 
 do_compile () {
     export CROSS_COMPILE="${TARGET_PREFIX}"
@@ -47,17 +48,30 @@ do_compile () {
     oe_runmake clean PLAT=${SOC_ATF}
     oe_runmake ${BUILD_STRING} PLAT=${SOC_ATF} bl31
 
+    # Build opteee version
+    if [ "${BUILD_OPTEE}" = "true" ]; then
+        oe_runmake clean PLAT=${SOC_ATF} BUILD_BASE=build-optee
+        oe_runmake ${BUILD_STRING} PLAT=${SOC_ATF} BUILD_BASE=build-optee SPD=opteed bl31
+    fi
     unset CROSS_COMPILE
 }
 
 do_install () {
     install -d ${D}/boot
     install -m 0644 ${S}/build/${SOC_ATF}/release/bl31.bin ${D}/boot/bl31-${SOC_ATF}.bin
+    # Install opteee version
+    if [ "${BUILD_OPTEE}" = "true" ]; then
+        install -m 0644 ${S}/build-optee/${SOC_ATF}/release/bl31.bin ${D}/boot/bl31-${SOC_ATF}.bin-optee
+    fi
 }
 
 do_deploy () {
     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
     install -m 0644 ${S}/build/${SOC_ATF}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${SOC_ATF}.bin
+    # Deploy opteee version
+    if [ "${BUILD_OPTEE}" = "true" ]; then
+        install -m 0644 ${S}/build-optee/${SOC_ATF}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${SOC_ATF}.bin-optee
+    fi
 }
 
 addtask deploy before do_install after do_compile