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>

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 38c8d8d..be9f2b9 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -213,6 +213,7 @@ config TARGET_MX6SABRESD
 
 config TARGET_MX6SLEVK
        bool "mx6slevk"
+       select MX6SL
        select SUPPORT_SPL
        select DM
        select DM_THERMAL

diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index 2954125..016266f 100644 (file)
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SLEVK=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y