diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-04-28 11:17:51 +0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 14:42:26 +0100 |
| commit | 03d7d266003fc087147b28d3198d0111abc15544 (patch) | |
| tree | 34587c349e7e56ea42a025809c67e4b55bac44b6 /arch/arm/cpu | |
| parent | bf85f481d5b87e24081e0332cf47b1ac29600b3f (diff) | |
MLK-10774-48 imx: mx7 update hab_caam_clock_enable
Merge hab_caam_clock_enable and hab_caam_clock_disable into
one function
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/clock.c | 12 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/hab.c | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv7/mx7/clock.c b/arch/arm/cpu/armv7/mx7/clock.c index 6298485c5d5..79a8e7560f8 100644 --- a/arch/arm/cpu/armv7/mx7/clock.c +++ b/arch/arm/cpu/armv7/mx7/clock.c @@ -1073,14 +1073,12 @@ void clock_init(void) } #ifdef CONFIG_SECURE_BOOT -void hab_caam_clock_enable(void) +void hab_caam_clock_enable(unsigned char enable) { - clock_enable(CCGR_CAAM, 1); -} - -void hab_caam_clock_disable(void) -{ - clock_enable(CCGR_CAAM, 0); + if (enable) + clock_enable(CCGR_CAAM, 1); + else + clock_enable(CCGR_CAAM, 0); } #endif diff --git a/arch/arm/cpu/armv7/mx7/hab.c b/arch/arm/cpu/armv7/mx7/hab.c index ae9591bfaf3..43b06bdcc8a 100644 --- a/arch/arm/cpu/armv7/mx7/hab.c +++ b/arch/arm/cpu/armv7/mx7/hab.c @@ -186,7 +186,7 @@ uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size) printf("\nAuthenticate uImage from DDR location 0x%x...\n", ddr_start); - hab_caam_clock_enable(); + hab_caam_clock_enable(1); if (hab_rvt_entry() == HAB_SUCCESS) { /* If not already aligned, Align to ALIGN_SIZE */ @@ -222,7 +222,7 @@ uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size) } else printf("hab entry function fail\n"); - hab_caam_clock_disable(); + hab_caam_clock_enable(0); get_hab_status(); } |