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>

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 81ab1256ec38a88956eb76a44c3c9c0081ffbdb7..e687048b3122b0cd763040423bf4b7e6463332e1 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,3 +1,6 @@
+config HAS_CAAM
+       bool
+
 config IMX_CONFIG
        string
 
@@ -28,7 +31,7 @@ config USE_IMXIMG_PLUGIN
 config SECURE_BOOT
        bool "Support i.MX HAB features"
        depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
-       select FSL_CAAM
+       select FSL_CAAM if HAS_CAAM
        imply CMD_DEKBLOB
        help
          This option enables the support for secure boot (HAB).

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index ef1f18089eca7f17d71fbf38ef1e057729d946b0..58ee20a8b603e2277b96effd7109d18e2cdfcb0a 100644 (file)
--- 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

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 365501d5187e94249ef77d2d4375722454a18e7b..4f8b4e138e3d9c99adcd97b980d79b2ecfe0c129 100644 (file)
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -10,6 +10,7 @@ config MX7
        default y
 
 config MX7D
+       select HAS_CAAM
        select ROM_UNIFIED_SECTIONS
        imply CMD_FUSE
        bool