summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/imx-mkimage/files
diff options
context:
space:
mode:
authorThomas Perrot <thomas.perrot@bootlin.com>2022-04-29 10:42:56 +0200
committerThomas Perrot <thomas.perrot@bootlin.com>2022-04-29 11:20:18 +0200
commit31108d3318e3d59fc387783a6100b90550951d66 (patch)
tree324749d08bcab0fecf0bc0167e7dfb42aab4b932 /recipes-bsp/imx-mkimage/files
parentf78603fca9e20a602421980dec64088f426ac58d (diff)
downloadmeta-freescale-31108d3318e3d59fc387783a6100b90550951d66.tar.gz
imx-mkimage: Fix a BL32 missing overriding in mkimage_fit_atf.sh
From the patch 0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch an occurrence of tee.bin wasn't replaced by $BL32. In addition, this patch use $BL31 and $BL32 value, in a displayed line, instead hardcoded values. Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
Diffstat (limited to 'recipes-bsp/imx-mkimage/files')
-rw-r--r--recipes-bsp/imx-mkimage/files/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch14
1 files changed, 8 insertions, 6 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
index 9e8360b5..72d83e63 100644
--- 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
@@ -1,4 +1,4 @@
1From 4e4e06602f594b335b4c264a3b062bc7af961078 Mon Sep 17 00:00:00 2001 1From ef28030129a04b1d70dbca3f2236fe7b1c67b4ed Mon Sep 17 00:00:00 2001
2From: Erik Larsson <erik.larsson@combitech.se> 2From: Erik Larsson <erik.larsson@combitech.se>
3Date: Thu, 8 Mar 2018 19:04:37 +0100 3Date: Thu, 8 Mar 2018 19:04:37 +0100
4Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31 4Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31
@@ -10,11 +10,11 @@ Signed-off-by: Christopher Dahlberg <crille.dahlberg@gmail.com>
10Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> 10Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
11Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com> 11Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
12--- 12---
13 iMX8M/mkimage_fit_atf.sh | 15 ++++++++------- 13 iMX8M/mkimage_fit_atf.sh | 19 ++++++++++---------
14 1 file changed, 8 insertions(+), 7 deletions(-) 14 1 file changed, 10 insertions(+), 9 deletions(-)
15 15
16diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh 16diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
17index 10903ea3bbf5..85ea6ffcc71d 100755 17index 10903ea3bbf5..341a4b3da1ef 100755
18--- a/iMX8M/mkimage_fit_atf.sh 18--- a/iMX8M/mkimage_fit_atf.sh
19+++ b/iMX8M/mkimage_fit_atf.sh 19+++ b/iMX8M/mkimage_fit_atf.sh
20@@ -6,6 +6,7 @@ 20@@ -6,6 +6,7 @@
@@ -42,10 +42,12 @@ index 10903ea3bbf5..85ea6ffcc71d 100755
42 if [ ! -f $BL32 ]; then 42 if [ ! -f $BL32 ]; then
43 BL32=/dev/null 43 BL32=/dev/null
44 else 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 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 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
47+ echo "$BL32 size: " >&2 49+ echo "$BL32 size: " >&2
48 ls -lct tee.bin | awk '{print $5}' >&2 50+ ls -lct $BL32 | awk '{print $5}' >&2
49 LOADABLES="$LOADABLES, \"tee-1\"" 51 LOADABLES="$LOADABLES, \"tee-1\""
50 fi 52 fi
51 53