summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mx6/Kconfig
diff options
context:
space:
mode:
authorBreno Lima <breno.lima@nxp.com>2017-11-27 21:09:00 -0200
committerStefano Babic <sbabic@denx.de>2017-12-29 11:18:59 +0100
commit52384b7e5c6c8229329138f83e2305675e13a98a (patch)
tree6b2c3c0498fd34702b1d0495803f0e17217cd3ef /arch/arm/mach-imx/mx6/Kconfig
parent051ba9e082f71f4709c32a69378192ca8964ca50 (diff)
imx: Kconfig: Add HAS_CAAM option
Currently CONFIG_SECURE_BOOT is selecting FSL_CAAM for all i.MX devices, this causes the following error when building mx6sl boards since this SoC doesn't have the CAAM block: In file included from drivers/crypto/fsl/jobdesc.c:12:0: drivers/crypto/fsl/jobdesc.c: In function 'inline_cnstr_jobdesc_blob_dek': include/fsl_sec.h:268:25: error: 'CAAM_ARB_BASE_ADDR' undeclared (first use in this function) #define SEC_MEM_PAGE1 (CAAM_ARB_BASE_ADDR + 0x1000) ^ drivers/crypto/fsl/jobdesc.c:140:21: note: in expansion of macro 'SEC_MEM_PAGE1' memcpy((uint32_t *)SEC_MEM_PAGE1, (uint32_t *)plain_txt, in_sz); ^ include/fsl_sec.h:268:25: note: each undeclared identifier is reported only once for each function it appears in #define SEC_MEM_PAGE1 (CAAM_ARB_BASE_ADDR + 0x1000) ^ drivers/crypto/fsl/jobdesc.c:140:21: note: in expansion of macro 'SEC_MEM_PAGE1' memcpy((uint32_t *)SEC_MEM_PAGE1, (uint32_t *)plain_txt, in_sz); ^ scripts/Makefile.build:280: recipe for target 'drivers/crypto/fsl/jobdesc.o' failed make[3]: *** [drivers/crypto/fsl/jobdesc.o] Error 1 scripts/Makefile.build:425: recipe for target 'drivers/crypto/fsl' failed make[2]: *** [drivers/crypto/fsl] Error 2 scripts/Makefile.build:425: recipe for target 'drivers/crypto' failed make[1]: *** [drivers/crypto] Error 2 Add HAS_CAAM configuration to avoid this error. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Diffstat (limited to 'arch/arm/mach-imx/mx6/Kconfig')
-rw-r--r--arch/arm/mach-imx/mx6/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index ef1f18089e..58ee20a8b6 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -14,28 +14,34 @@ config MX6
imply CMD_FUSE
config MX6D
+ select HAS_CAAM
select MX6_SMP
bool
config MX6DL
+ select HAS_CAAM
select MX6_SMP
bool
config MX6Q
+ select HAS_CAAM
select MX6_SMP
bool
config MX6QDL
+ select HAS_CAAM
select MX6_SMP
bool
config MX6S
+ select HAS_CAAM
bool
config MX6SL
bool
config MX6SX
+ select HAS_CAAM
select ROM_UNIFIED_SECTIONS
bool
@@ -44,6 +50,7 @@ config MX6SLL
bool
config MX6UL
+ select HAS_CAAM
select SYS_L2CACHE_OFF
select ROM_UNIFIED_SECTIONS
bool