diff options
| author | Horia Geantă <horia.geanta@nxp.com> | 2017-05-02 12:25:27 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-09-25 07:25:23 (GMT) |
| commit | 0d2b1ae588773ca2a2c2bcec1a16ae0c9626cdb1 (patch) | |
| tree | d3959204a90507a81cda586ecd3218903b31fee8 /drivers/crypto/caam/Kconfig | |
| parent | 3c773f43e50bbdfa864aeffe6c2ff4acc3f3472f (diff) | |
| download | linux-0d2b1ae588773ca2a2c2bcec1a16ae0c9626cdb1.tar.xz | |
crypto: caam - revert rename of CRYPTO_DEV_FSL_CAAM
CRYPTO_DEV_FSL_CAAM has been renamed to
CRYPTO_DEV_FSL_CAAM_PLAT_BACKEND to accommodate for caam/jr, caam/qi
and caam/qi2 drivers sharing error.{c,h}.
However, the change is incomplete, since CRYPTO_DEV_FSL_CAAM should have
been renamed also in defconfig files.
Fix this by reverting the rename of CRYPTO_DEV_FSL_CAAM (which avoids
defconfig files updates):
-s/CRYPTO_DEV_FSL_CAAM/CRYPTO_DEV_FSL_CAAM_COMMON
-s/CRYPTO_DEV_FSL_CAAM_PLAT_BACKEND/CRYPTO_DEV_FSL_CAAM
Fixes: 21806c254f4a ("crypto: caam/qi2 - add DPAA2-CAAM driver")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Diffstat (limited to 'drivers/crypto/caam/Kconfig')
| -rw-r--r-- | drivers/crypto/caam/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig index bac7048..a9931bd 100644 --- a/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig @@ -1,10 +1,10 @@ -config CRYPTO_DEV_FSL_CAAM +config CRYPTO_DEV_FSL_CAAM_COMMON tristate -config CRYPTO_DEV_FSL_CAAM_PLAT_BACKEND +config CRYPTO_DEV_FSL_CAAM tristate "Freescale CAAM-Multicore platform driver backend" depends on FSL_SOC || ARCH_MXC || ARCH_LAYERSCAPE - select CRYPTO_DEV_FSL_CAAM + select CRYPTO_DEV_FSL_CAAM_COMMON help Enables the driver module for Freescale's Cryptographic Accelerator and Assurance Module (CAAM), also known as the SEC version 4 (SEC4). @@ -15,7 +15,7 @@ config CRYPTO_DEV_FSL_CAAM_PLAT_BACKEND To compile this driver as a module, choose M here: the module will be called caam. -if CRYPTO_DEV_FSL_CAAM_PLAT_BACKEND +if CRYPTO_DEV_FSL_CAAM config CRYPTO_DEV_FSL_CAAM_IMX def_bool SOC_IMX6 || SOC_IMX7D @@ -153,13 +153,13 @@ config CRYPTO_DEV_FSL_CAAM_RNG_API endif # CRYPTO_DEV_FSL_CAAM_JR -endif # CRYPTO_DEV_FSL_CAAM_PLAT_BACKEND +endif # CRYPTO_DEV_FSL_CAAM config CRYPTO_DEV_FSL_DPAA2_CAAM tristate "QorIQ DPAA2 CAAM (DPSECI) driver" depends on FSL_MC_DPIO default "m" - select CRYPTO_DEV_FSL_CAAM + select CRYPTO_DEV_FSL_CAAM_COMMON select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC select CRYPTO_AEAD |