From: Steve Cornelius <steve.cornelius@freescale.com>
Date: Tue, 26 Jun 2012 01:19:09 +0000 (-0700)
Subject: ENGR00215228-11: Enable ahash and rng configurations
X-Git-Tag: v3.0.35-fsl~841
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9bd0e7c4ae6226c7d6b46a8178fd94da84d9be81;p=karo-tx-linux.git

ENGR00215228-11: Enable ahash and rng configurations

Add in ahash and rng options for build. Note that because of the way
platform devices detect (as opposed to of-based detection), modularization
of API interfaces is suppressed. Once CONFIG_OF is possible, this
can go away.

Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com>
---

diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig
index 82a1011978d8..a4637711e9bc 100644
--- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig
@@ -58,7 +58,9 @@ config CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
 	  threshold. Range is 1-65535.
 
 config CRYPTO_DEV_FSL_CAAM_CRYPTO_API
-	tristate "Register algorithm implementations with the Crypto API"
+#	Forced to non-module for current ARM branch, until CONFIG_OF possible
+#	tristate "Register algorithm implementations with the Crypto API"
+	boolean "Register algorithm implementations with the Crypto API"
 	depends on CRYPTO_DEV_FSL_CAAM
 	default y
 	select CRYPTO_ALGAPI
@@ -70,3 +72,40 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API
 
 	  To compile this as a module, choose M here: the module
 	  will be called caamalg.
+
+config CRYPTO_DEV_FSL_CAAM_AHASH_API
+#	Forced to non-module for current ARM branch, until CONFIG_OF possible
+#	tristate "Register hash algorithm implementations with Crypto API"
+	boolean "Register hash algorithm implementations with Crypto API"
+	depends on CRYPTO_DEV_FSL_CAAM
+	default y
+	select CRYPTO_AHASH
+	help
+	  Selecting this will offload ahash for users of the
+	  scatterlist crypto API to the SEC4 via job ring.
+
+	  To compile this as a module, choose M here: the module
+	  will be called caamhash.
+
+config CRYPTO_DEV_FSL_CAAM_RNG_API
+#	Forced to non-module for current ARM branch, until CONFIG_OF possible
+#	tristate "Register caam device for hwrng API"
+	boolean "Register caam device for hwrng API"
+	depends on CRYPTO_DEV_FSL_CAAM
+	default y
+	select CRYPTO_RNG
+	help
+	  Selecting this will register the SEC4 hardware rng to
+	  the hw_random API for suppying the kernel entropy pool.
+
+	  To compile this as a module, choose M here: the module
+	  will be called caamrng.
+
+config CRYPTO_DEV_FSL_CAAM_RNG_TEST
+	boolean "Test caam rng"
+	depends on CRYPTO_DEV_FSL_CAAM_RNG_API
+	default n
+	help
+	  Selecting this will enable self-test for caam rng.
+
+
diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile
index ef39011b4505..deee4b3a44df 100644
--- a/drivers/crypto/caam/Makefile
+++ b/drivers/crypto/caam/Makefile
@@ -4,5 +4,8 @@
 
 obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam.o
 obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o
+obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API) += caamhash.o
+obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API) += caamrng.o
+
+caam-objs := ctrl.o jr.o error.o key_gen.o
 
-caam-objs := ctrl.o jr.o error.o