summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch')
-rw-r--r--recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch71
1 files changed, 0 insertions, 71 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
deleted file mode 100644
index 72d83e63..00000000
--- a/recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From ef28030129a04b1d70dbca3f2236fe7b1c67b4ed Mon Sep 17 00:00:00 2001
2From: Erik Larsson <erik.larsson@combitech.se>
3Date: Thu, 8 Mar 2018 19:04:37 +0100
4Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
5
6Upstream-Status: Pending
7
8Signed-off-by: Erik Larsson <karl.erik.larsson@gmail.com>
9Signed-off-by: Christopher Dahlberg <crille.dahlberg@gmail.com>
10Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
11Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
12---
13 iMX8M/mkimage_fit_atf.sh | 19 ++++++++++---------
14 1 file changed, 10 insertions(+), 9 deletions(-)
15
16diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
17index 10903ea3bbf5..341a4b3da1ef 100755
18--- a/iMX8M/mkimage_fit_atf.sh
19+++ b/iMX8M/mkimage_fit_atf.sh
20@@ -6,6 +6,7 @@
21 # usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
22
23 [ -z "$BL31" ] && BL31="bl31.bin"
24+
25 # keep backward compatibility
26 [ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000"
27
28@@ -18,23 +19,23 @@ if [ ! -f $BL31 ]; then
29 echo "ERROR: BL31 file $BL31 NOT found" >&2
30 exit 0
31 else
32- echo "bl31.bin size: " >&2
33- ls -lct bl31.bin | awk '{print $5}' >&2
34+ echo "$BL31 size: " >&2
35+ ls -lct $BL31 | awk '{print $5}' >&2
36 fi
37
38-BL32="tee.bin"
39+[ -z "$BL32" ] && BL32="tee.bin"
40 LOADABLES="\"atf-1\""
41
42 if [ ! -f $BL32 ]; then
43 BL32=/dev/null
44 else
45- echo "Building with TEE support, make sure your bl31 is compiled with spd. If you do not want tee, please delete tee.bin" >&2
46- echo "tee.bin size: " >&2
47- ls -lct tee.bin | awk '{print $5}' >&2
48+ echo "Building with TEE support, make sure $BL31 is compiled with spd. If you do not want tee, please delete $BL32" >&2
49+ echo "$BL32 size: " >&2
50+ ls -lct $BL32 | awk '{print $5}' >&2
51 LOADABLES="$LOADABLES, \"tee-1\""
52 fi
53
54-BL33="u-boot-nodtb.bin"
55+[ -z "$BL33" ] && BL33="u-boot-nodtb.bin"
56 DEK_BLOB="dek_blob_fit_dummy.bin"
57
58 if [ ! -f $DEK_BLOB ]; then
59@@ -49,8 +50,8 @@ if [ ! -f $BL33 ]; then
60 exit 0
61 else
62
63- echo "u-boot-nodtb.bin size: " >&2
64- ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
65+ echo "$BL33 size: " >&2
66+ ls -lct $BL33 | awk '{print $5}' >&2
67 fi
68
69 for dtname in $*
70--
712.35.1