diff options
| author | Ye Li <ye.li@nxp.com> | 2017-04-04 16:31:01 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 19:48:58 +0800 |
| commit | e0a78c87a10e46cc651167135d970a27d2ea2273 (patch) | |
| tree | 9c299b1d1b5eceb7beb0881fa8dadceae6deae83 | |
| parent | 39f0f68ed6db8ef10606ddd76a3362aa474633d3 (diff) | |
| download | u-boot-imx-e0a78c87a10e46cc651167135d970a27d2ea2273.zip u-boot-imx-e0a78c87a10e46cc651167135d970a27d2ea2273.tar.gz u-boot-imx-e0a78c87a10e46cc651167135d970a27d2ea2273.tar.bz2 | |
MLK-14506-2 HAB: Disable CAAM driver for SoC using DCP
The MX6SL, SLL and ULL have DCP to replace CAAM in SoC. We have to
disable the CAAM driver for them.
Signed-off-by: Ye Li <ye.li@nxp.com>
| -rw-r--r-- | arch/arm/imx-common/Kconfig | 2 | ||||
| -rw-r--r-- | include/configs/mx6_common.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index effbb8d..3d2239d 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -35,7 +35,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 !MX6ULL && !MX6SLL && !MX6SL help This option enables the support for secure boot (HAB). See doc/README.mxc_hab for more details. diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 8d90e14..532490a 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -111,7 +111,9 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6S) /* Secure boot (HAB) support */ #ifdef CONFIG_SECURE_BOOT #define CONFIG_CSF_SIZE 0x4000 +#if !defined(CONFIG_MX6ULL) && !defined(CONFIG_MX6SLL) && !defined(CONFIG_MX6SL) #define CONFIG_CMD_DEKBLOB +#endif #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #endif |