imx-atf: update to 2.2

From NXP BSP 5.4.24-2.1.0.

Dropped 0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable, The patched
file no longer exist, do_compile does not output a warning.

Related-to: ELB-2758
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

3 files changed, 48 insertions, 52 deletions

diff --git a/recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch b/recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch
deleted file mode 100644
index f976c04..0000000
--- a/recipes-bsp/imx-atf/imx-atf/0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ef0745861de6fc60ca7c5aec385419d12494f17d Mon Sep 17 00:00:00 2001
-From: Ming Liu <ming.liu@toradex.com>
-Date: Sat, 14 Mar 2020 19:50:08 +0100
-Subject: [PATCH] imx8m: imx_rdc.c: fix a uninitialized variable
-
-This fixes a following error:
-| plat/imx/common/imx8m/imx_rdc.c: In function 'imx_rdc_set_masters':
-| plat/imx/common/imx8m/imx_rdc.c:146:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-
-Upstream-Status: Pending
-
-Signed-off-by: Ming Liu <ming.liu@toradex.com>
----
- plat/imx/common/imx8m/imx_rdc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plat/imx/common/imx8m/imx_rdc.c b/plat/imx/common/imx8m/imx_rdc.c
-index 1a21cd318..b539e0553 100644
---- a/plat/imx/common/imx8m/imx_rdc.c
-+++ b/plat/imx/common/imx8m/imx_rdc.c
-@@ -135,7 +135,7 @@ int imx_rdc_set_mda(struct rdc_mda_conf *p)
-  */
- int imx_rdc_set_masters(struct rdc_mda_conf *masters_list, uint32_t count)
- {
--	int i, ret;
-+	int i, ret = 0;
- 
- 	for (i = 0; i < count; i++) {
- 		ret = imx_rdc_set_mda(&masters_list[i]);
--- 
-2.25.1
-
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-plat-imx8mm-provide-uart-base-as-build-option.patch b/recipes-bsp/imx-atf/imx-atf/0001-plat-imx8mm-provide-uart-base-as-build-option.patch
new file mode 100644
index 0000000..d28c219
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf/0001-plat-imx8mm-provide-uart-base-as-build-option.patch
@@ -0,0 +1,43 @@
+From bbfc87c96dec60dda19438b7d6ecd2a5f4431380 Mon Sep 17 00:00:00 2001
+From: Igor Opaniuk <igor.opaniuk@gmail.com>
+Date: Thu, 5 Mar 2020 22:10:41 +0200
+Subject: [PATCH 1/2] plat: imx8mm: provide uart base as build option
+
+Some boards (f.e. Verdin i.MX8M Mini) use different UART base address
+for serial debug output, so make this value configurable (as a
+build option).
+
+Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
+Change-Id: I988492ccecbc3f64a5153b381c4a97b8a0181f52
+(cherry picked from commit 60a23af2e57931161169c2981bf19af3847c533c)
+---
+ plat/imx/imx8m/imx8mm/include/platform_def.h | 1 -
+ plat/imx/imx8m/imx8mm/platform.mk            | 3 +++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plat/imx/imx8m/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h
+index 42b03613e..094818087 100644
+--- a/plat/imx/imx8m/imx8mm/include/platform_def.h
++++ b/plat/imx/imx8m/imx8mm/include/platform_def.h
+@@ -51,7 +51,6 @@
+ 
+ #define HAB_RVT_BASE			U(0x00000900) /* HAB_RVT for i.MX8MM */
+ 
+-#define IMX_BOOT_UART_BASE		U(0x30890000)
+ #define IMX_BOOT_UART_CLK_IN_HZ		24000000 /* Select 24MHz oscillator */
+ 
+ #define PLAT_CRASH_UART_BASE		IMX_BOOT_UART_BASE
+diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
+index 600a3c449..51da5c0ed 100644
+--- a/plat/imx/imx8m/imx8mm/platform.mk
++++ b/plat/imx/imx8m/imx8mm/platform.mk
+@@ -66,3 +66,6 @@ $(eval $(call add_define,BL32_SIZE))
+ ifeq (${SPD},trusty)
+ 	BL31_CFLAGS    +=      -DPLAT_XLAT_TABLES_DYNAMIC=1
+ endif
++
++IMX_BOOT_UART_BASE	?=	0x30890000
++$(eval $(call add_define,IMX_BOOT_UART_BASE))
+-- 
+2.20.1
+
diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend
index c2b727c..33034dc 100644
--- a/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -1,29 +1,14 @@
-#PV = "1.5.0+git${SRCPV}"
-#SRCBRANCH = "imx_4.14.78_1.0.0_ga"
-#SRCREV = "d6451cc1e162eff89b03dd63e86d55b9baa8885b"
-#PLATFORM_mx8qxp  = "imx8qxp"
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI_append = " \
-    file://0001-imx8m-imx_rdc.c-fix-a-uninitialized-variable.patch \
+    file://0001-plat-imx8mm-provide-uart-base-as-build-option.patch \
     file://0001-Revert-Add-NXP-s-SoCs-partition-reboot-support.patch \
 "
 
-PV = "2.0+git${SRCPV}"
-SRCBRANCH = "imx_4.14.98_2.3.0"
-SRCREV = "bb209a0b4ccca2aa4a3a887f9606dc4a3d294adf"
-PLATFORM_mx8qxp  = "imx8qx"
-PLATFORM_mx8mn  = "imx8mn"
+PV = "2.2+git${SRCPV}"
+SRCBRANCH = "imx_5.4.24_2.1.0"
+SRCREV = "b0a00f22b09c13572d3e87902a1069dee34763bd"
 
-EXTRA_OEMAKE_mx8mm += " \
+EXTRA_OEMAKE_append_verdin-imx8mm = " \
     IMX_BOOT_UART_BASE=0x30860000 \
 "
-
-# imx-atf 1.5 uses bl31-imx8qxp.bin, 2.0 will use bl31-imx8qx.bin for a
-# platform specific filename. Provide both for now, so that the user of
-# the file need not care.
-do_deploy_append_mx8qxp () {
-    install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-imx8qx.bin
-    install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-imx8qxp.bin
-}