From 9a6c26e7aef7bca29c031035051922249c691ad1 Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@nxp.com>
Date: Wed, 16 Dec 2020 16:18:53 +0800
Subject: atf-tools: upgrade to 2.3

Use atf-2.3.inc to hold common parts for atf and atf-tools.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-bsp/atf/atf-2.3.inc      | 13 +++++++++++++
 recipes-bsp/atf/atf-tools_2.3.bb | 14 ++++++++++++++
 recipes-bsp/atf/atf-tools_git.bb | 19 -------------------
 3 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 recipes-bsp/atf/atf-2.3.inc
 create mode 100644 recipes-bsp/atf/atf-tools_2.3.bb
 delete mode 100644 recipes-bsp/atf/atf-tools_git.bb

diff --git a/recipes-bsp/atf/atf-2.3.inc b/recipes-bsp/atf/atf-2.3.inc
new file mode 100644
index 000000000..bc8b912af
--- /dev/null
+++ b/recipes-bsp/atf/atf-2.3.inc
@@ -0,0 +1,13 @@
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
+
+PV = "2.3+git${SRCPV}"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1 \
+           git://github.com/ARMmbed/mbedtls;nobranch=1;destsuffix=git/mbedtls;name=mbedtls \
+"
+SRCREV = "4e40e24590ab908773ef842cd0e17faf233767d4"
+SRCREV_mbedtls = "85da85555e5b086b0250780693c3ee584f63e79f"
+SRCREV_FORMAT = "atf"
+
+S = "${WORKDIR}/git"
diff --git a/recipes-bsp/atf/atf-tools_2.3.bb b/recipes-bsp/atf/atf-tools_2.3.bb
new file mode 100644
index 000000000..57f53168a
--- /dev/null
+++ b/recipes-bsp/atf/atf-tools_2.3.bb
@@ -0,0 +1,14 @@
+require atf-${PV}.inc
+
+SUMMARY = "Tools for ARM Trusted Firmware, e.g. FIP image creation tool"
+
+DEPENDS += "openssl"
+
+EXTRA_OEMAKE = "fiptool V=1 HOSTCC='${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}'"
+
+do_install () {
+    install -m 0755 -d ${D}/${bindir}
+    install -m 0755 ${S}/tools/fiptool/fiptool ${D}/${bindir}/
+}
+
+BBCLASSEXTEND = "native"
diff --git a/recipes-bsp/atf/atf-tools_git.bb b/recipes-bsp/atf/atf-tools_git.bb
deleted file mode 100644
index 33ec51c24..000000000
--- a/recipes-bsp/atf/atf-tools_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Tools for ARM Trusted Firmware, e.g. FIP image creation tool"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443"
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1"
-SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "openssl"
-
-EXTRA_OEMAKE = "fiptool V=1 HOSTCC='${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}'"
-
-do_install () {
-    install -m 0755 -d ${D}/${bindir}
-    install -m 0755 ${S}/tools/fiptool/fiptool ${D}/${bindir}/
-}
-
-BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf