@@ -1,17 +1,18 @@
-From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001
+From a4993eda7483cd01662f3f3e2965e7a568cb7178 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
+Subject: [PATCH 1/4] Add support for overriding BL32 and BL33 not only BL31
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: Bram Vlerick <bram.vlerick@openpixelsystems.org>
---
iMX8M/mkimage_fit_atf.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh
-index 95749b1..c1aa902 100755
+index 4f2b3f3..0444ff0 100755
--- a/iMX8M/mkimage_fit_atf.sh
+++ b/iMX8M/mkimage_fit_atf.sh
@@ -18,23 +18,23 @@ if [ ! -f $BL31 ]; then
@@ -26,7 +27,7 @@ index 95749b1..c1aa902 100755
-BL32="tee.bin"
+[ -z "$BL32" ] && BL32="tee.bin"
- LOADABLES="\"atf@1\""
+ LOADABLES="\"atf-1\""
if [ ! -f $BL32 ]; then
BL32=/dev/null
@@ -36,7 +37,7 @@ index 95749b1..c1aa902 100755
- ls -lct tee.bin | awk '{print $5}' >&2
+ echo "$BL32 size: " >&2
+ ls -lct $BL32 | awk '{print $5}' >&2
- LOADABLES="$LOADABLES, \"tee@1\""
+ LOADABLES="$LOADABLES, \"tee-1\""
fi
-BL33="u-boot-nodtb.bin"
@@ -56,5 +57,5 @@ index 95749b1..c1aa902 100755
for dtname in $*
--
-2.25.1
+2.31.1
@@ -1,26 +1,27 @@
-From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001
+From b7ace564b419a05a375a205fd4df8933716b241a Mon Sep 17 00:00:00 2001
From: Erik Larsson <erik.larsson@combitech.se>
Date: Tue, 6 Mar 2018 12:28:39 +0100
-Subject: [PATCH] Add LDFLAGS to link step
+Subject: [PATCH 2/4] Add LDFLAGS to link step
Signed-off-by: Erik Larsson <karl.erik.larsson@gmail.com>
+Signed-off-by: Bram Vlerick <bram.vlerick@openpixelsystems.org>
---
iMX8M/soc.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
-index d714259..aecf84b 100644
+index 4bfdc37..806b805 100644
--- a/iMX8M/soc.mak
+++ b/iMX8M/soc.mak
-@@ -67,7 +67,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT)
+@@ -84,7 +84,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT)
$(MKIMG): mkimage_imx8.c
@echo "PLAT="$(PLAT) "HDMI="$(HDMI)
@echo "Compiling mkimage_imx8"
- $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz
+ $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz
- u-boot-spl-ddr.bin: u-boot-spl.bin lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin
- @objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
+ lpddr4_imem_1d = lpddr4_pmu_train_1d_imem$(LPDDR_FW_VERSION).bin
+ lpddr4_dmem_1d = lpddr4_pmu_train_1d_dmem$(LPDDR_FW_VERSION).bin
--
-2.25.1
+2.31.1
@@ -1,7 +1,7 @@
-From b25b4324be4c0dd9ee5fecdf2981d291fb187686 Mon Sep 17 00:00:00 2001
+From 30e81d949d03f24de3b89d14cf98cb7decb2740c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
Date: Mon, 25 Feb 2019 22:15:55 +0100
-Subject: [PATCH] Add unused fake version
+Subject: [PATCH 3/4] Add unused fake version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -12,15 +12,16 @@ We can safely add a fake version here, because the code to
print it is broken anyway.
Signed-off-by: André Hentschel <nerv@dawncrow.de>
+Signed-off-by: Bram Vlerick <bram.vlerick@openpixelsystems.org>
---
Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
-index 49ef486..b966399 100644
+index 1c0b039..49639a5 100644
--- a/Makefile
+++ b/Makefile
-@@ -37,9 +37,7 @@ $(MKIMG): src/build_info.h $(SRCS)
+@@ -41,9 +41,7 @@ $(MKIMG): src/build_info.h $(SRCS)
bin: $(MKIMG)
src/build_info.h:
@@ -32,5 +33,5 @@ index 49ef486..b966399 100644
help:
@echo $(CURR_DIR)
--
-2.25.1
+2.31.1
@@ -1,27 +1,28 @@
-From 8fc8fc3dfce7533b9c965185277d34e27055cc8f Mon Sep 17 00:00:00 2001
+From b1e77d8ccabc6a3910ede2441ff567326291a355 Mon Sep 17 00:00:00 2001
From: Thomas Perrot <thomas.perrot@bootlin.com>
Date: Tue, 26 Apr 2022 15:10:04 +0200
-Subject: [PATCH] Add support for overriding BL31, BL32 and BL33
+Subject: [PATCH 4/4] Add support for overriding BL31, BL32 and BL33
Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
+Signed-off-by: Bram Vlerick <bram.vlerick@openpixelsystems.org>
---
iMX8M/print_fit_hab.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/iMX8M/print_fit_hab.sh b/iMX8M/print_fit_hab.sh
-index b915115d1ecc..dbc28f2d9af5 100755
+index b915115..dbc28f2 100755
--- a/iMX8M/print_fit_hab.sh
+++ b/iMX8M/print_fit_hab.sh
@@ -1,12 +1,16 @@
#!/bin/bash
-
+
-BL32="tee.bin"
-
let fit_off=$1
-
+
# keep backward compatibility
[ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000"
-
+
+[ -z "$BL31" ] && BL31="bl31.bin"
+
+[ -z "$BL32" ] && BL32="tee.bin"
@@ -34,28 +35,28 @@ index b915115d1ecc..dbc28f2d9af5 100755
@@ -26,7 +30,7 @@ else
let uboot_sign_off=$((fit_off - 0x8000 - ivt_off + 0x3000))
fi
-
+
-let uboot_size=$(ls -lct u-boot-nodtb.bin | awk '{print $5}')
+let uboot_size=$(ls -lct $BL33 | awk '{print $5}')
let uboot_load_addr=0x40200000
-
+
let last_sign_off=$(((uboot_sign_off + uboot_size + 3) & ~3))
@@ -64,13 +68,13 @@ done
-
+
let atf_sign_off=$((last_sign_off))
let atf_load_addr=$ATF_LOAD_ADDR
-let atf_size=$(ls -lct bl31.bin | awk '{print $5}')
+let atf_size=$(ls -lct $BL31 | awk '{print $5}')
-
+
if [ ! -f $BL32 ]; then
let tee_size=0x0
let tee_sign_off=$((atf_sign_off + atf_size))
else
- let tee_size=$(ls -lct tee.bin | awk '{print $5}')
+ let tee_size=$(ls -lct $BL32 | awk '{print $5}')
-
+
let tee_sign_off=$(((atf_sign_off + atf_size + 3) & ~3))
let tee_load_addr=$TEE_LOAD_ADDR
---
-2.35.1
+--
+2.31.1
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 2746136aa5ed79ba24cfbe877d29022a2a33f6614b1bba728e95d1b2f0448196 imx-mkimage-rel_imx_5.4.70_2.3.0-br1.tar.gz
+sha256 769b3d7376a1f7107ce2958a1babe361bfd29e2cbfbe47eeb2911acc460058e5 imx-mkimage-lf-5.10.72_2.2.0-br1.tar.gz
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
@@ -4,7 +4,7 @@
#
################################################################################
-IMX_MKIMAGE_VERSION = rel_imx_5.4.70_2.3.0
+IMX_MKIMAGE_VERSION = lf-5.10.72_2.2.0
IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage
IMX_MKIMAGE_SITE_METHOD = git
IMX_MKIMAGE_LICENSE = GPL-2.0+
Signed-off-by: Bram Vlerick <bram.vlerick@openpixelsystems.org> --- ...overriding-BL32-and-BL33-not-only-BL.patch | 13 ++++----- .../0002-Add-LDFLAGS-to-link-step.patch | 15 ++++++----- .../0003-Add-unused-fake-version.patch | 11 ++++---- ...rt-for-overriding-BL31-BL32-and-BL33.patch | 27 ++++++++++--------- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 2 +- 6 files changed, 37 insertions(+), 33 deletions(-)