From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 27 Jan 2013 17:23:12 +0000 (+0000)
Subject: kernel: clean up crypto related kconfig options
X-Git-Tag: reboot~11492
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ed7ca5d44ed2676c414aa8027787d1cd0989e4a1;p=openwrt%2Fstaging%2Fchunkeey.git

kernel: clean up crypto related kconfig options

SVN-Revision: 35327
---

diff --git a/target/linux/adm5120/config-3.7 b/target/linux/adm5120/config-3.7
index 49e7e94428..fb8b67034a 100644
--- a/target/linux/adm5120/config-3.7
+++ b/target/linux/adm5120/config-3.7
@@ -61,22 +61,6 @@ CONFIG_CPU_R4K_CACHE_TLB=y
 CONFIG_CPU_R4K_FPU=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=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER=m
-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_DECOMPRESS_LZMA=y
diff --git a/target/linux/ar71xx/config-3.7 b/target/linux/ar71xx/config-3.7
index 0190180e76..713149b097 100644
--- a/target/linux/ar71xx/config-3.7
+++ b/target/linux/ar71xx/config-3.7
@@ -110,9 +110,6 @@ CONFIG_CPU_R4K_CACHE_TLB=y
 CONFIG_CPU_R4K_FPU=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
diff --git a/target/linux/cns21xx/config-3.7 b/target/linux/cns21xx/config-3.7
index 24529e989c..e6913f6f16 100644
--- a/target/linux/cns21xx/config-3.7
+++ b/target/linux/cns21xx/config-3.7
@@ -39,9 +39,6 @@ CONFIG_CPU_FA526=y
 CONFIG_CPU_PABRT_LEGACY=y
 CONFIG_CPU_TLB_FA=y
 CONFIG_CPU_USE_DOMAINS=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
diff --git a/target/linux/generic/config-3.7 b/target/linux/generic/config-3.7
index 0bd5c8787f..01aea328c6 100644
--- a/target/linux/generic/config-3.7
+++ b/target/linux/generic/config-3.7
@@ -469,12 +469,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
@@ -511,7 +511,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/lantiq/config-3.7 b/target/linux/lantiq/config-3.7
index e2620d0672..a86d2865b1 100644
--- a/target/linux/lantiq/config-3.7
+++ b/target/linux/lantiq/config-3.7
@@ -22,9 +22,6 @@ CONFIG_CPU_R4K_CACHE_TLB=y
 CONFIG_CPU_R4K_FPU=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 # CONFIG_DEBUG_PINCTRL is not set
diff --git a/target/linux/malta/config-3.7 b/target/linux/malta/config-3.7
index 52b0166dab..80fbe60fcd 100644
--- a/target/linux/malta/config-3.7
+++ b/target/linux/malta/config-3.7
@@ -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/mpc83xx/config-3.7 b/target/linux/mpc83xx/config-3.7
index 45bf495311..691e713c71 100644
--- a/target/linux/mpc83xx/config-3.7
+++ b/target/linux/mpc83xx/config-3.7
@@ -42,9 +42,6 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=m
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
@@ -58,8 +55,6 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_RNG2=y
diff --git a/target/linux/ppc40x/config-3.7 b/target/linux/ppc40x/config-3.7
index 73be0446fe..485302a34c 100644
--- a/target/linux/ppc40x/config-3.7
+++ b/target/linux/ppc40x/config-3.7
@@ -28,9 +28,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DTC=y
diff --git a/target/linux/ppc44x/config-3.7 b/target/linux/ppc44x/config-3.7
index 4243b10f19..d498eb2094 100644
--- a/target/linux/ppc44x/config-3.7
+++ b/target/linux/ppc44x/config-3.7
@@ -34,9 +34,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DTC=y
diff --git a/target/linux/rb532/config-3.7 b/target/linux/rb532/config-3.7
index 85121886b0..4cf0a889fb 100644
--- a/target/linux/rb532/config-3.7
+++ b/target/linux/rb532/config-3.7
@@ -23,12 +23,6 @@ CONFIG_CPU_R4K_FPU=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y