From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 27 Jan 2013 17:49:09 +0000 (+0000)
Subject: kernel: clean up crypto kconfig options on 3.8
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=156a6e799914faefbf9935d9eb5309b2283d2e23;p=openwrt%2Fstaging%2Fdedeckeh.git

kernel: clean up crypto kconfig options on 3.8

SVN-Revision: 35329
---

diff --git a/target/linux/generic/config-3.8 b/target/linux/generic/config-3.8
index c6a36af177..5008d7c54b 100644
--- a/target/linux/generic/config-3.8
+++ b/target/linux/generic/config-3.8
@@ -474,12 +474,12 @@ CONFIG_CROSS_COMPILE=""
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_AES_ARM is not set
 # CONFIG_CRYPTO_AES_NI_INTEL is not set
-# CONFIG_CRYPTO_ALGAPI is not set
-# CONFIG_CRYPTO_ALGAPI2 is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
@@ -516,7 +516,7 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
diff --git a/target/linux/malta/config-3.8 b/target/linux/malta/config-3.8
index 52b0166dab..80fbe60fcd 100644
--- a/target/linux/malta/config-3.8
+++ b/target/linux/malta/config-3.8
@@ -51,23 +51,6 @@ CONFIG_CPU_R4K_FPU=y
 CONFIG_CPU_RMAP=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DAVICOM_PHY=m
diff --git a/target/linux/realview/config-3.8 b/target/linux/realview/config-3.8
index 6b1cf62176..317b73fe90 100644
--- a/target/linux/realview/config-3.8
+++ b/target/linux/realview/config-3.8
@@ -77,9 +77,6 @@ CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CPU_V6=y
 CONFIG_CPU_V6K=y
 CONFIG_CPU_V7=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_LL_UART_NONE is not set