From e29efa2fb75c2bbe70f5f4027973eab5660db9cc Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 8 Sep 2015 12:31:04 +0000 Subject: kernel: remove packaging of kmod-crypto-core and kmod-crypto-arc4 Everything except for blkcipher was already built-in, so make blkcipher built-in as well. Signed-off-by: Felix Fietkau SVN-Revision: 46820 --- target/linux/generic/config-3.18 | 5 +++-- target/linux/generic/config-4.0 | 5 +++-- target/linux/generic/config-4.1 | 5 +++-- target/linux/omap/config-3.18 | 3 --- target/linux/orion/config-default | 1 - target/linux/sunxi/config-3.18 | 3 --- target/linux/sunxi/config-4.1 | 3 --- 7 files changed, 9 insertions(+), 16 deletions(-) (limited to 'target') diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18 index 8a87d7194c..6e5ad7fae5 100644 --- a/target/linux/generic/config-3.18 +++ b/target/linux/generic/config-3.18 @@ -700,9 +700,10 @@ 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 +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_BLKCIPHER is not set +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set diff --git a/target/linux/generic/config-4.0 b/target/linux/generic/config-4.0 index 978b84cc0b..4ea364cf56 100644 --- a/target/linux/generic/config-4.0 +++ b/target/linux/generic/config-4.0 @@ -710,9 +710,10 @@ 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 +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_BLKCIPHER is not set +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1 index 6baaa93234..c8fa2b9745 100644 --- a/target/linux/generic/config-4.1 +++ b/target/linux/generic/config-4.1 @@ -724,9 +724,10 @@ 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 +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_BLKCIPHER is not set +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set diff --git a/target/linux/omap/config-3.18 b/target/linux/omap/config-3.18 index a06a350a37..d5003c275b 100644 --- a/target/linux/omap/config-3.18 +++ b/target/linux/omap/config-3.18 @@ -114,9 +114,6 @@ CONFIG_CPU_V7=y CONFIG_CRC16=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=m CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CTR=m diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default index 196310f6f7..4c816be22b 100644 --- a/target/linux/orion/config-default +++ b/target/linux/orion/config-default @@ -37,7 +37,6 @@ CONFIG_CPU_FEROCEON_OLD_ID=y CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_TLB_FEROCEON=y CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_DEV_MV_CESA=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y diff --git a/target/linux/sunxi/config-3.18 b/target/linux/sunxi/config-3.18 index 5cef84b6cf..bdfe88af1b 100644 --- a/target/linux/sunxi/config-3.18 +++ b/target/linux/sunxi/config-3.18 @@ -110,9 +110,6 @@ CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y CONFIG_CRC16=y CONFIG_CRC_T10DIF=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_DES=y diff --git a/target/linux/sunxi/config-4.1 b/target/linux/sunxi/config-4.1 index 17fca75e9d..d083a59e9f 100644 --- a/target/linux/sunxi/config-4.1 +++ b/target/linux/sunxi/config-4.1 @@ -133,9 +133,6 @@ CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AES_ARM=y CONFIG_CRYPTO_AES_ARM_CE=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRYPTD=y -- cgit v1.2.3