From ae082eac6f1affb9cfd8aa7dde5d02e3a510f44b Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 14 Apr 2020 18:17:56 +0200
Subject: [PATCH] zeus migration: imx-atf: remove custom recipe reusing the
 upstream version

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../recipes-bsp/imx-atf/imx-atf_2.0.bb        | 85 -------------------
 .../recipes-bsp/imx-atf/imx-atf_2.0.bbappend  | 34 ++++++++
 2 files changed, 34 insertions(+), 85 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bb
 create mode 100644 meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bbappend

diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bb b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bb
deleted file mode 100644
index b1c84b70c..000000000
--- a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bb
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2017-2018 NXP
-
-DESCRIPTION = "i.MX ARM Trusted Firmware"
-SECTION = "BSP"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit fsl-eula-unpack pkgconfig deploy
-
-PV = "2.0+git${SRCPV}"
-
-ATF_SRC ?= "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https"
-SRCBRANCH = "imx_4.14.98_2.3.0"
-
-SRC_URI = "${ATF_SRC};branch=${SRCBRANCH}"
-SRCREV = "09c5cc994634060ad7dfef4620866838d19694a4"
-
-SRC_URI_append_ccimx8mn = " file://0001-imx8mn-Disable-M7-debug-console.patch"
-
-S = "${WORKDIR}/git"
-
-BOOT_TOOLS = "imx-boot-tools"
-
-SOC_ATF ?= "imx8qm"
-SOC_ATF_mx8qm = "imx8qm"
-SOC_ATF_mx8qxp = "imx8qx"
-SOC_ATF_mx8mq = "imx8mq"
-SOC_ATF_mx8mm = "imx8mm"
-SOC_ATF_mx8mn = "imx8mn"
-
-SYSROOT_DIRS += "/boot"
-
-BUILD_OPTEE = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'true', 'false', d)}"
-
-do_compile () {
-    export CROSS_COMPILE="${TARGET_PREFIX}"
-    cd ${S}
-    # Clear LDFLAGS to avoid the option -Wl recognize issue
-    unset LDFLAGS
-
-    echo "-> Build ${SOC_ATF} bl31.bin"
-    # Set BUIL_STRING with the revision info
-    BUILD_STRING=""
-    if [ -e ${S}/.revision ]; then
-        cur_rev=`cat ${S}/.revision`
-        echo " Current revision is ${cur_rev} ."
-        BUILD_STRING="BUILD_STRING=${cur_rev}"
-    else
-        echo " No .revision found! "
-    fi
-    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
-
-FILES_${PN} = "/boot"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx8)"
diff --git a/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bbappend b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
new file mode 100644
index 000000000..3d86ccc5a
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
@@ -0,0 +1,34 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRCBRANCH = "imx_5.4.3_2.0.0"
+ATF_SRC ?= "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https"
+SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
+           file://0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch \
+"
+SRCREV = "f1a195b5cce64365a7227557a9009a4f545aa02d"
+
+SRC_URI_append_ccimx8mn = " file://0001-imx8mn-Disable-M7-debug-console.patch"
+
+PLATFORM_mx8x   = "imx8qx"
+# Override PLATFORM_mx8qxp from the included recipe
+PLATFORM_mx8qxp = "imx8qx"
+PLATFORM_mx8mn  = "imx8mn"
+PLATFORM_mx8mp  = "imx8mp"
+PLATFORM_imx8dxlevk = "imx8dxl"
+PLATFORM_mx8dxlevk-phantom = "imx8qx"
+PLATFORM_mx8dx = "imx8dx"
+
+BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
+
+do_compile_append() {
+    if [ "${BUILD_OPTEE}" = "true" ]; then
+        oe_runmake clean BUILD_BASE=build-optee
+        oe_runmake BUILD_BASE=build-optee SPD=opteed bl31
+    fi
+}
+
+do_deploy_append () {
+    if [ "${BUILD_OPTEE}" = "true" ]; then
+        install -m 0644 ${S}/build-optee/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin-optee
+    fi
+}