imx: hab: Fix a couple of build warnings with DEBUG enabled
Subsystems (3)
PATCH 1/2 imx: hab: Fix a couple of build warnings with DEBUG enabled
In case the DEBUG is enabled, these three lines warn about cast of pointer to integer of different size, add the missing casts to fix the warnings.
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ye Li <[email protected]>
--- arch/arm/mach-imx/hab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-imx/hab.c +3 -3
@@ -932,10 +932,10 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size,printf ("ivt entry = 0x%08x, dcd = 0x%08x, csf = 0x%08x\n" , ivt->entry, ivt->dcd, ivt->csf);puts ("Dumping IVT\n" ); -print_buffer (ivt_addr, (void *)(ivt_addr),4 ,0x8 ,0 ); +print_buffer (ivt_addr, (void *)(uintptr_t )(ivt_addr),4 ,0x8 ,0 );puts ("Dumping CSF Header\n" ); -print_buffer (ivt->csf, (void *)(ivt->csf),4 ,0x10 ,0 ); +print_buffer (ivt->csf, (void *)(uintptr_t )(ivt->csf),4 ,0x10 ,0 );#if !defined(CONFIG_SPL_BUILD )get_hab_status ();
@@ -944,7 +944,7 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size,puts ("\nCalling authenticate_image in ROM\n" );printf ("\tivt_offset = 0x%x\n" , ivt_offset);printf ("\tstart = 0x%08lx\n" , start); -printf ("\tbytes = 0x%x\n" , bytes); +printf ("\tbytes = 0x%lx\n" , (ulong )bytes);#endif #ifndef CONFIG_ARM64
Signature · 1 line
2.39.2
PATCH 2/2 imx: hab: Simplify the mechanism
The current mechanism is unnecessarily complex. Simplify the whole mechanism such that the entire fitImage is signed, IVT is placed at the end, followed by CSF, and this entire bundle is also authenticated. This makes the signing scripting far simpler.
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ye Li <[email protected]>
--- arch/arm/dts/imx8mm-u-boot.dtsi | 2 + arch/arm/dts/imx8mn-u-boot.dtsi | 2 + arch/arm/dts/imx8mp-u-boot.dtsi | 2 + arch/arm/dts/imx8mq-u-boot.dtsi | 2 + arch/arm/mach-imx/spl.c | 65 ++++++---------- common/spl/spl_fit.c | 7 -- doc/imx/habv4/csf_examples/mx8m/csf.sh | 28 ++----- doc/imx/habv4/csf_examples/mx8m/csf_fit.txt | 10 +-- doc/imx/habv4/guides/mx8m_spl_secure_boot.txt | 74 ++++--------------- include/spl.h | 6 -- 10 files changed, 51 insertions(+), 147 deletions(-)
arch/arm/dts/imx8mm-u-boot.dtsi +2 -0
@@ -81,7 +81,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif fit,fdt-list = "of-list"; #address-cells = <1>;
arch/arm/dts/imx8mn-u-boot.dtsi +2 -0
@@ -145,7 +145,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif fit,fdt-list = "of-list"; #address-cells = <1>;
arch/arm/dts/imx8mp-u-boot.dtsi +2 -0
@@ -103,7 +103,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif fit,fdt-list = "of-list"; #address-cells = <1>;
arch/arm/dts/imx8mq-u-boot.dtsi +2 -0
@@ -97,7 +97,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif #address-cells = <1>; images {
arch/arm/mach-imx/spl.c +21 -44
97 lines not on this page · raw message
common/spl/spl_fit.c +0 -7
@@ -27,10 +27,6 @@ struct spl_fit_info {int conf_node;/* FDT offset to selected configuration node */ }; -__weak void board_spl_fit_post_load (const void *fit) -{ -} -__weak ulong board_spl_fit_size_align (ulong size) {return size;
@@ -829,8 +825,5 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, spl_image->flags |=SPL_FIT_FOUND ; -if (IS_ENABLED (CONFIG_IMX_HAB )) -board_spl_fit_post_load (ctx.fit); -return 0 ; }
doc/imx/habv4/csf_examples/mx8m/csf.sh +5 -23
@@ -37,29 +37,11 @@ dd if=csf_spl.bin of=flash.bin bs=1 seek=${spl_dd_offset} conv=notrunc # 3) Sign u-boot.itb -# fitImage tree -fit_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_TEXT_BASE=/ s@.*=@@p" .config) - $(sed -n "/CONFIG_FIT_EXTERNAL_OFFSET=/ s@.*=@@p" .config) - 0x200 - 0x40)) ) +# fitImage +fit_block_base=$(printf "0x%x" $(sed -n "/CONFIG_SPL_LOAD_FIT_ADDRESS=/ s@.*=@@p" .config) ) fit_block_offset=$(printf "0x%s" $(fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset)) -fit_block_size=$(printf "0x%x" $(( ( ($(fdtdump u-boot.itb 2>/dev/null | sed -n "/^...totalsize:/ s@.*\(0x[0-9a-f]\+\).*@\1@p") + 0x1000 - 0x1 ) & ~(0x1000 - 0x1)) + 0x20 )) ) -sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset $fit_block_size \"flash.bin\", \\\\@" csf_fit.tmp - -# U-Boot -uboot_block_base=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/uboot load)) -uboot_block_offset=$(printf "0x%x" $(( $(printf "0x%s" $(fdtget -t x u-boot.itb /images/uboot data-position)) + ${fit_block_offset} ))) -uboot_block_size=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/uboot data-size)) -sed -i "/0xuuuu/ s@.*@ $uboot_block_base $uboot_block_offset $uboot_block_size \"flash.bin\", \\\\@" csf_fit.tmp - -# ATF -atf_block_base=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/atf load)) -atf_block_offset=$(printf "0x%x" $(( $(printf "0x%s" $(fdtget -t x u-boot.itb /images/atf data-position)) + ${fit_block_offset} ))) -atf_block_size=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/atf data-size)) -sed -i "/0xaaaa/ s@.*@ $atf_block_base $atf_block_offset $atf_block_size \"flash.bin\", \\\\@" csf_fit.tmp - -# DTB -dtb_block_base=$(printf "0x%x" $(( ${uboot_block_base} + ${uboot_block_size} ))) -dtb_block_offset=$(printf "0x%x" $(( $(printf "0x%s" $(fdtget -t x u-boot.itb /images/fdt-1 data-position)) + ${fit_block_offset} ))) -dtb_block_size=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/fdt-1 data-size)) -sed -i "/0xdddd/ s@.*@ $dtb_block_base $dtb_block_offset $dtb_block_size \"flash.bin\"@" csf_fit.tmp +fit_block_size=$(printf "0x%x" $(( ( ( $(stat -tc %s u-boot.itb) + 0x1000 - 0x1 ) & ~(0x1000 - 0x1)) + 0x20 )) ) +sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset $fit_block_size \"flash.bin\"@" csf_fit.tmp # IVT ivt_ptr_base=$(printf "%08x" ${fit_block_base} | sed "s@\(..\)\(..\)\(..\)\(..\)@0x\4\3\2\1@")
@@ -68,7 +50,7 @@ csf_block_base=$(printf "%08x" $(( ${fit_block_base} + ${fit_block_size} )) | se ivt_block_offset=$((${fit_block_offset} + ${fit_block_size} - 0x20)) csf_block_offset=$((${ivt_block_offset} + 0x20)) -echo "0xd1002041 ${ivt_ptr_base} 0x00000000 0x00000000 0x00000000 ${ivt_block_base} ${csf_block_base} 0x00000000" | xxd -r -p > ivt.bin +echo "0xd1002041 ${ivt_block_base} 0x00000000 0x00000000 0x00000000 ${ivt_block_base} ${csf_block_base} 0x00000000" | xxd -r -p > ivt.bin dd if=ivt.bin of=flash.bin bs=1 seek=${ivt_block_offset} conv=notrunc # Generate CSF blob
doc/imx/habv4/csf_examples/mx8m/csf_fit.txt +2 -8
@@ -26,11 +26,5 @@ [Authenticate Data] Verification index = 2 # FIXME: - # Line 1 -- fitImage tree - # Line 2 -- U-Boot u-boot-nodtb.bin blob - # Line 3 -- ATF BL31 blob - # Line 4 -- DT blob - Blocks = 0x401fcdc0 0x57c00 0xffff "flash.bin", \ - 0x40200000 0x62c00 0xuuuu "flash.bin", \ - 0x920000 0x00000 0xaaaa "flash.bin", \ - 0x40200000 0x00000 0xdddd "flash.bin" + # Line 1 -- fitImage + Blocks = 0x401fcdc0 0x57c00 0xffff "flash.bin"
doc/imx/habv4/guides/mx8m_spl_secure_boot.txt +15 -59
104 lines not on this page · raw message
include/spl.h +0 -6
@@ -871,12 +871,6 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image);int board_return_to_bootrom (struct spl_image_info *spl_image,struct spl_boot_device *bootdev); -/** -* board_spl_fit_post_load - allow process images after loading finished -* @fit: Pointer to a valid Flattened Image Tree blob -*/ -void board_spl_fit_post_load (const void *fit); -/** * board_spl_fit_size_align - specific size align before processing payload *
Signature · 1 line
2.39.2
Re: [PATCH 2/2] imx: hab: Simplify the mechanism
Quoted 7 lines · Marek Vasut
The current mechanism is unnecessarily complex. Simplify the whole mechanism such that the entire fitImage is signed, IVT is placed at the end, followed by CSF, and this entire bundle is also authenticated. This makes the signing scripting far simpler.
Signed-off-by Marek Vasut <[email protected]>
Quoted 6 lines · Marek Vasut
In case the DEBUG is enabled, these three lines warn about cast of pointer to integer of different size, add the missing casts to fix the warnings.
Signed-off-by Marek Vasut <[email protected]>
Hello Marek,
Quoted 15 lines · Marek Vasut
In case the DEBUG is enabled, these three lines warn about cast of pointer to integer of different size, add the missing casts to fix the warnings.
Signed-off-by Marek Vasut <[email protected]>---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ye Li <[email protected]>
Quoted 3 lines
--- arch/arm/mach-imx/hab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]