MLK-17898: mx6sl: Select MX6SL option via Kconfig
authorBreno Lima <breno.lima@nxp.com>
Tue, 20 Mar 2018 13:34:20 +0000 (10:34 -0300)
committerYe Li <ye.li@nxp.com>
Fri, 23 Mar 2018 02:48:44 +0000 (19:48 -0700)
commita28603934e6ba2f07b92714b462df1e5e494bce6
tree7931a89d838db8d2c592e790c68a08806a6fb80a
parentd4c01cd3f6f5ba59ca17ebf52f610f629895ac7a
MLK-17898: mx6sl: Select MX6SL option via Kconfig

Currently it's not possible to build i.MX6SL EVK with CONFIG_SECURE_BOOT
enabled:

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

Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS, so
CONFIG_FSL_CAAM is being wrongly selected by the imx-common Kconfig.
Select CONFIG_MX6SL via Kconfig to address this issue.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
arch/arm/cpu/armv7/mx6/Kconfig
configs/mx6slevk_defconfig