summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Ramirez-Ortiz <jorge@foundries.io>2020-12-16 14:48:19 +0100
committerJérôme Forissier <jerome@forissier.org>2021-01-06 14:43:42 +0100
commit331295055d27d460ec3a70cf76c6af4168ce66ca (patch)
tree15c451fdf0adb802e5a7496de8247a5b43b829a3
parentbaa5161d50da0b430760fa9e2180496c2806f839 (diff)
plat-imx: do not enable CFG_CRYPTO_DRIVER with CFG_NXP_CAAM
Some IMX users might choose a different crypto driver (like the SE050) but still require CAAM to provide the hardware unique key and perhaps the RNG - since reading the RNG over I2C can impact performance on some platforms. This commit allows for such configuration. Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io> Acked-by: Clement Faure <clement.faure@nxp.com>
-rw-r--r--core/arch/arm/plat-imx/conf.mk8
-rw-r--r--core/arch/arm/plat-imx/crypto_conf.mk5
2 files changed, 5 insertions, 8 deletions
diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 23320148..3f882028 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -408,14 +408,6 @@ ifeq ($(CFG_NXP_CAAM),y)
# As NXP CAAM Driver is enabled, disable the small local CAAM driver
# used just to release Job Rings to Non-Secure world
$(call force,CFG_IMX_CAAM,n)
-
-# If NXP CAAM Driver is supported, the Crypto Driver interfacing
-# it with generic crypto API can be enabled.
-CFG_CRYPTO_DRIVER ?= y
-# Crypto Driver Debug
-# DRV_DBG_TRACE BIT32(0) // Driver trace
-# DRV_DBG_BUF BIT32(1) // Driver dump Buffer
-CFG_CRYPTO_DRIVER_DEBUG ?= 0
else
ifneq (,$(filter y, $(CFG_MX6) $(CFG_MX7) $(CFG_MX7ULP)))
diff --git a/core/arch/arm/plat-imx/crypto_conf.mk b/core/arch/arm/plat-imx/crypto_conf.mk
index faee3967..a16048ab 100644
--- a/core/arch/arm/plat-imx/crypto_conf.mk
+++ b/core/arch/arm/plat-imx/crypto_conf.mk
@@ -41,6 +41,11 @@ $(call force, CFG_JR_INT,137) # Default JR IT Number (105 + 32) = 137
#
ifeq ($(CFG_CRYPTO_DRIVER), y)
+# Crypto Driver Debug
+# DRV_DBG_TRACE BIT32(0) // Driver trace
+# DRV_DBG_BUF BIT32(1) // Driver dump Buffer
+CFG_CRYPTO_DRIVER_DEBUG ?= 0
+
$(call force, CFG_NXP_CAAM_RUNTIME_JR, y)
#