Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mx7ulp: Add HAB boot support

Browse source 
Add CAAM clock functions, SEC_CONFIG[1] fuse checking, and default CSF
size for HAB support boot on mx7ulp.

Users need to uncomment the CONFIG_SECURE_BOOT in mx7ulp_evk.h to build
secure uboot.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by : Stefano Babic <sbabic@denx.de>
This commit is contained in:
Peng Fan 2017-02-22 16:21:53 +08:00 committed by Stefano Babic
parent 7edf5c45f0
commit 27117b2024
4 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/cpu/armv7/mx7ulp/clock.c
View file

@ -313,6 +313,16 @@ void clock_init(void)
enable_usboh3_clk(1); enable_usboh3_clk(1);
} }
#ifdef CONFIG_SECURE_BOOT
void hab_caam_clock_enable(unsigned char enable)
{
if (enable)
pcc_clock_enable(PER_CLK_CAAM, true);
else
pcc_clock_enable(PER_CLK_CAAM, false);
}
#endif
/* /*
* Dump some core clockes. * Dump some core clockes.
*/ */

8
arch/arm/cpu/armv7/mx7ulp/soc.c
View file

@ -7,9 +7,17 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/imx-common/hab.h>
static char *get_reset_cause(char *); static char *get_reset_cause(char *);
#if defined(CONFIG_SECURE_BOOT)
struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
.bank = 29,
.word = 6,
};
#endif
u32 get_cpu_rev(void) u32 get_cpu_rev(void)
{ {
/* Temporally hard code the CPU rev to 0x73, rev 1.0. Fix it later */ /* Temporally hard code the CPU rev to 0x73, rev 1.0. Fix it later */

3
arch/arm/imx-common/hab.c
View file

@ -77,7 +77,8 @@
#define MX6DLS_PU_IROM_MMU_EN_VAR 0x00901dd0 #define MX6DLS_PU_IROM_MMU_EN_VAR 0x00901dd0
#define MX6SL_PU_IROM_MMU_EN_VAR 0x00900a18 #define MX6SL_PU_IROM_MMU_EN_VAR 0x00900a18
#define IS_HAB_ENABLED_BIT \ #define IS_HAB_ENABLED_BIT \
(is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2) (is_soc_type(MXC_SOC_MX7ULP) ? 0x80000000 : \
(is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2))
/* /*
* +------------+ 0x0 (DDR_UIMAGE_START) - * +------------+ 0x0 (DDR_UIMAGE_START) -

1
arch/arm/include/asm/arch-mx7ulp/clock.h
View file

@ -39,4 +39,5 @@ void enable_usboh3_clk(unsigned char enable);
#endif #endif
void init_clk_usdhc(u32 index); void init_clk_usdhc(u32 index);
void clock_init(void); void clock_init(void);
void hab_caam_clock_enable(unsigned char enable);
#endif #endif