| Message ID | 1515760819-15116-22-git-send-email-bryan.odonoghue@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4467ae6c28aa7eef84d5784f56234472a015d5e2 |
| Headers | show |
| Series | Fix and extend i.MX HAB layer | expand |
Hi Bryan, 2018-01-12 10:40 GMT-02:00 Bryan O'Donoghue <bryan.odonoghue@linaro.org>: > The BootROM will not successfully process a HAB image passed by u-boot > unless the board has been set into locked mode. Some of the existing usages > of authenticate_image() expect and rely on unlocked boards doing the > following > > 1. Not calling into the BootROM authenticate_image() callback > 2. Returning a pass status for authenticate_image() calls anyway > > A previous patch removed the necessity to call into imx_hab_is_enabled() > twice. This patch ensures the reliance on authenticate_image() returning > zero is maintained. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Suggested-by: Breno Matheus Lima <brenomatheus@gmail.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > Cc: Sven Ebenfeld <sven.ebenfeld@gmail.com> > Cc: George McCollister <george.mccollister@gmail.com> Thanks for adding this patch on the series, I tested on an open mx6ulevk board and it's working fine. Tested-by: Breno Lima <breno.lima@nxp.com>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index d917ac3..3b19a7e 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -458,7 +458,7 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size, if (!imx_hab_is_enabled()) { puts("hab fuse not enabled\n"); - return result; + return 0; } printf("\nAuthenticate image from DDR location 0x%x...\n",
The BootROM will not successfully process a HAB image passed by u-boot unless the board has been set into locked mode. Some of the existing usages of authenticate_image() expect and rely on unlocked boards doing the following 1. Not calling into the BootROM authenticate_image() callback 2. Returning a pass status for authenticate_image() calls anyway A previous patch removed the necessity to call into imx_hab_is_enabled() twice. This patch ensures the reliance on authenticate_image() returning zero is maintained. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Suggested-by: Breno Matheus Lima <brenomatheus@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Peng Fan <peng.fan@nxp.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Sven Ebenfeld <sven.ebenfeld@gmail.com> Cc: George McCollister <george.mccollister@gmail.com> --- arch/arm/mach-imx/hab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)