Commit a28603934e6ba2f07b92714b462df1e5e494bce6

Authored by Breno Lima
Committed by Ye Li
1 parent d4c01cd3f6

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>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

arch/arm/cpu/armv7/mx6/Kconfig
... ... @@ -213,6 +213,7 @@
213 213  
214 214 config TARGET_MX6SLEVK
215 215 bool "mx6slevk"
  216 + select MX6SL
216 217 select SUPPORT_SPL
217 218 select DM
218 219 select DM_THERMAL
configs/mx6slevk_defconfig
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_MX6=y
3 3 CONFIG_TARGET_MX6SLEVK=y
4   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
  4 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
5 5 CONFIG_BOOTDELAY=3
6 6 CONFIG_HUSH_PARSER=y
7 7 CONFIG_CMD_BOOTZ=y