aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBreno Lima <breno.lima@nxp.com>2018-02-20 01:19:22 +0000
committerStefano Babic <sbabic@denx.de>2018-02-22 14:35:20 +0100
commit669f2d189e4c3a738ad2863a5f8f66a85d468bd9 (patch)
treef9542c3a9d85cce7f7b6b84e3eb626b2a353dfcf
parentd247cf50698a590571cf9a6fd4608e702580e40e (diff)
downloadu-boot-669f2d189e4c3a738ad2863a5f8f66a85d468bd9.zip
u-boot-669f2d189e4c3a738ad2863a5f8f66a85d468bd9.tar.gz
u-boot-669f2d189e4c3a738ad2863a5f8f66a85d468bd9.tar.bz2
imx: hab: Keep CAAM clock enabled after authenticating additional images
Currently it is not possible to run CMD_DEK on i.MX SPL targets: => dek_blob 0x12000000 0x12001000 128 The system hangs after running dek_blob because the CAAM clock is being disabled by the HAB code. There is no need to disable CAAM clock after authenticating additional boot images, thus keep CAAM clock enabled to address this issue. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
-rw-r--r--arch/arm/mach-imx/hab.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 5f19777..1e6b31d 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -507,13 +507,13 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size,
/* Verify IVT header bugging out on error */
if (verify_ivt_header(ivt_hdr))
- goto hab_caam_clock_disable;
+ goto hab_authentication_exit;
/* Verify IVT body */
if (ivt->self != ivt_addr) {
printf("ivt->self 0x%08x pointer is 0x%08x\n",
ivt->self, ivt_addr);
- goto hab_caam_clock_disable;
+ goto hab_authentication_exit;
}
start = ddr_start;
@@ -591,8 +591,7 @@ hab_exit_failure_print_status:
get_hab_status();
#endif
-hab_caam_clock_disable:
- hab_caam_clock_enable(0);
+hab_authentication_exit:
if (load_addr != 0)
result = 0;