]> git.baikalelectronics.ru Git - uboot.git/commit
habv4: tools: Avoid hardcoded CSF size for SPL targets
authorBreno Matheus Lima <breno.lima@nxp.com>
Thu, 18 Jul 2019 12:34:15 +0000 (12:34 +0000)
committerStefano Babic <sbabic@denx.de>
Tue, 8 Oct 2019 14:35:59 +0000 (16:35 +0200)
commit964ecee5a0d4553cb3166d31b95e5617f469cabc
treebceebee7e668192eece5e9aa5af9cf2d92043c65
parent781688e682e5652db79524fb50f4c22bdf646bb3
habv4: tools: Avoid hardcoded CSF size for SPL targets

Currently it's not possible to authenticate the U-Boot proper of
mx6ul_14x14_evk_defconfig target:

Authenticate image from DDR location 0x877fffc0...
bad magic magic=0x0 length=0x00 version=0x3
bad length magic=0x0 length=0x00 version=0x3
bad version magic=0x0 length=0x00 version=0x3
spl: ERROR:  image authentication fail

Commit bd1a6fd20f48 ("imx: hab: Increase CSF_SIZE for i.MX6 and
i.MX7 devices") has increased CSF_SIZE to avoid a possible issue
when booting encrypted boot images.

Commit b322712b915c ("tools: mkimage: add firmware-ivt image type
for HAB verification") is hardcoding the CSF and IVT sizes, the
new CSF size is not being considered and u-boot-ivt.img fails to
boot.

Avoid hardcoded CSF and IVT size to fix this issue.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
common/image.c
tools/default_image.c