1 files changed, 69 insertions, 0 deletions

diff --git a/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch b/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
new file mode 100644
index 00000000..9e8360b5
--- /dev/null
+++ b/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
@@ -0,0 +1,69 @@
+From 4e4e06602f594b335b4c264a3b062bc7af961078 Mon Sep 17 00:00:00 2001
+From: Erik Larsson <erik.larsson@combitech.se>
+Date: Thu, 8 Mar 2018 19:04:37 +0100
+Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
+
+Upstream-Status: Pending
+
+Signed-off-by: Erik Larsson <karl.erik.larsson@gmail.com>
+Signed-off-by: Christopher Dahlberg <crille.dahlberg@gmail.com>
+Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
+Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
+---
+ iMX8M/mkimage_fit_atf.sh | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
+index 10903ea3bbf5..85ea6ffcc71d 100755
+--- a/iMX8M/mkimage_fit_atf.sh
++++ b/iMX8M/mkimage_fit_atf.sh
+@@ -6,6 +6,7 @@
+ # usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
+
+ [ -z "$BL31" ] && BL31="bl31.bin"
++
+ # keep backward compatibility
+ [ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000"
+
+@@ -18,23 +19,23 @@ if [ ! -f $BL31 ]; then
+        echo "ERROR: BL31 file $BL31 NOT found" >&2
+        exit 0
+ else
+-       echo "bl31.bin size: " >&2
+-       ls -lct bl31.bin | awk '{print $5}' >&2
++       echo "$BL31 size: " >&2
++       ls -lct $BL31 | awk '{print $5}' >&2
+ fi
+
+-BL32="tee.bin"
++[ -z "$BL32" ] && BL32="tee.bin"
+ LOADABLES="\"atf-1\""
+
+ if [ ! -f $BL32 ]; then
+        BL32=/dev/null
+ else
+        echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
+-       echo "tee.bin size: " >&2
++       echo "$BL32 size: " >&2
+        ls -lct tee.bin | awk '{print $5}' >&2
+        LOADABLES="$LOADABLES, \"tee-1\""
+ fi
+
+-BL33="u-boot-nodtb.bin"
++[ -z "$BL33" ] && BL33="u-boot-nodtb.bin"
+ DEK_BLOB="dek_blob_fit_dummy.bin"
+
+ if [ ! -f $DEK_BLOB ]; then
+@@ -49,8 +50,8 @@ if [ ! -f $BL33 ]; then
+        exit 0
+ else
+
+-       echo "u-boot-nodtb.bin size: " >&2
+-       ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
++       echo "$BL33 size: " >&2
++       ls -lct $BL33 | awk '{print $5}' >&2
+ fi
+
+ for dtname in $*
+--
+2.35.1