From: Breno Lima Date: Tue, 20 Mar 2018 13:34:20 +0000 (-0300) Subject: MLK-17898: mx6sl: Select MX6SL option via Kconfig X-Git-Tag: rel_imx_4.9.88_2.0.0_ga~27 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=a28603934e6ba2f07b92714b462df1e5e494bce6;p=u-boot.git 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 Reviewed-by: Ye Li --- diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 38c8d8d6b1..be9f2b9054 100644 --- 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 2954125837..016266f43b 100644 --- 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