Hello Marcel,
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Marcel Ziswiler Sent: Friday, August 20, 2021 10:52 PM To: u-boot@lists.denx.de Cc: Heiko Thiery heiko.thiery@gmail.com; Stefano Babic sbabic@denx.de; Fabio Estevam festevam@gmail.com; Frieder Schrempf frieder.schrempf@kontron.de; Marcel Ziswiler marcel.ziswiler@toradex.com; NXP i.MX U-Boot Team <uboot- imx@nxp.com>; Peng Fan peng.fan@nxp.com Subject: [PATCH v1 1/7] imx: mkimage_fit_atf: fix legacy image generation
From: Marcel Ziswiler marcel.ziswiler@toradex.com
While most boards meanwhile migrated to using binman a few like the verdin- imx8mm are still using the legacy image generation. Unfortunately, the legacy image generation is currently broken which is especially bad for any kind of bisection attempts. Anyway, this fixes it even though we will also migrate to using binman shortly.
This change has been already proposed in [1], but the discussion went into the direction of monolithic "flash.bin" rather than a migration to use binman.
I guess if this change is really needed due to the fact that the migration of some boards is really difficult - the original patch can be taken.
However, I've commented out in that thread that there is a warning regarding the usage of scripts and migration notice, so maybe it does make sense to spend extra effort to migrate away from this script at all?
Fixes: commit cb9faa6f98ae ("tools: Use a single target-independent config to enable OpenSSL") Signed-off-by: Marcel Ziswiler marcel.ziswiler@toradex.com
arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach- imx/mkimage_fit_atf.sh index 2a17968794c..2d6c46633c7 100755 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh @@ -53,7 +53,7 @@ cat << __HEADER_EOF description = "Configuration to load ATF before U-Boot";
images {
uboot@1 {
uboot_1 { description = "U-Boot (64-bit)"; os = "u-boot"; data = /incbin/("$BL33"); @@ -68,7 +68,7 @@ cnt=1 for dtname in $*do cat << __FDT_IMAGE_EOF
fdt@$cnt {
fdt_$cnt { description = "$(basename $dtname .dtb)"; data = /incbin/("$dtname"); type = "flat_dt"; @@ -79,7 +79,7 @@ cnt=$((cnt+1)) donecat << __HEADER_EOF
atf@1 {
atf_1 { description = "ARM Trusted Firmware"; os = "arm-trusted-firmware"; data = /incbin/("$BL31"); @@ -93,7 +93,7 @@ __HEADER_EOFif [ -f $BL32 ]; then cat << __HEADER_EOF
tee@1 {
tee_1 { description = "TEE firmware"; data = /incbin/("$BL32"); type = "firmware"; @@ -108,7 +108,7 @@ fi cat <<__CONF_HEADER_EOF }; configurations {
default = "config@1";
default = "config_1";__CONF_HEADER_EOF
@@ -117,20 +117,20 @@ for dtname in $* do if [ -f $BL32 ]; then cat << __CONF_SECTION_EOF
config@$cnt {
config_$cnt { description = "$(basename $dtname .dtb)";
firmware = "uboot@1";loadables = "atf@1", "tee@1";fdt = "fdt@$cnt";
firmware = "uboot_1";loadables = "atf_1", "tee_1";fdt = "fdt_$cnt"; };__CONF_SECTION_EOF else cat << __CONF_SECTION1_EOF
config@$cnt {
config_$cnt { description = "$(basename $dtname .dtb)";
firmware = "uboot@1";loadables = "atf@1";fdt = "fdt@$cnt";
firmware = "uboot_1";loadables = "atf_1";fdt = "fdt_$cnt"; };__CONF_SECTION1_EOF fi -- 2.26.2
Link: [1]: https://lore.kernel.org/u-boot/20210505120053.9466-1-oliver.graute@kococonne...
Regards, Andrey