Merge git://git.denx.de/u-boot-marvell

[u-boot] / lib / rsa / Kconfig

diff --git a/lib/rsa/Kconfig b/lib/rsa/Kconfig
index 09ec3582423bc0fc30c37531ade495e06f65fa01..2b33f323bcccff0f3a792b71d3f270050b1449fa 100644 (file)
--- a/lib/rsa/Kconfig
+++ b/lib/rsa/Kconfig
@@ -1,6 +1,6 @@
 config RSA
        bool "Use RSA Library"
-       select RSA_FREESCALE_EXP if FSL_CAAM
+       select RSA_FREESCALE_EXP if FSL_CAAM && !ARCH_MX7 && !ARCH_MX6 && !ARCH_MX5
        select RSA_SOFTWARE_EXP if !RSA_FREESCALE_EXP
        help
          RSA support. This enables the RSA algorithm used for FIT image
@@ -13,14 +13,14 @@ config RSA
          option. The software based modular exponentiation is built into
          mkimage irrespective of this option.
 
+if RSA
+
 config SPL_RSA
        bool "Use RSA Library within SPL"
-       depends on RSA
 
-if RSA
 config RSA_SOFTWARE_EXP
        bool "Enable driver for RSA Modular Exponentiation in software"
-       depends on DM && RSA
+       depends on DM
        help
          Enables driver for modular exponentiation in software. This is a RSA
          algorithm used in FIT image verification. It required RSA Key as
@@ -29,7 +29,7 @@ config RSA_SOFTWARE_EXP
 
 config RSA_FREESCALE_EXP
        bool "Enable RSA Modular Exponentiation with FSL crypto accelerator"
-       depends on DM && RSA && FSL_CAAM
+       depends on DM && FSL_CAAM && !ARCH_MX7 && !ARCH_MX6 && !ARCH_MX5
        help
        Enables driver for RSA modular exponentiation using Freescale cryptographic
        accelerator - CAAM.