diff options
author | Tomasz Maciej Nowak <tmn505@gmail.com> | 2022-06-20 14:49:45 +0200 |
---|---|---|
committer | Christian Lamparter <chunkeey@gmail.com> | 2022-06-24 17:10:24 +0200 |
commit | 539e60539a2fde6531bd179c94bb9c7f8f490f2b (patch) | |
tree | fa2546d84835b7753238d35f4472877e2c8289ce /target/linux/sunxi | |
parent | 9bad3451b66d0c01105851d1514ae1ee43d60160 (diff) | |
download | upstream-539e60539a2fde6531bd179c94bb9c7f8f490f2b.tar.gz upstream-539e60539a2fde6531bd179c94bb9c7f8f490f2b.tar.bz2 upstream-539e60539a2fde6531bd179c94bb9c7f8f490f2b.zip |
generic: enable CRYPTO_LIB_BLAKE2S[_X86|_ARM]
This is now built-in, enable so it won't propagate on target configs.
Link: https://lkml.org/lkml/2022/1/3/168
Fixes: 79e7a2552e89 ("kernel: bump 5.15 to 5.15.44")
Fixes: 0ca93670693b ("kernel: bump 5.10 to 5.10.119")
Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
(Link to Kernel's commit taht made it built-in,
CRYPTO_LIB_BLAKE2S[_ARM|_X86] as it's selectable, 5.10 backport)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux/sunxi')
-rw-r--r-- | target/linux/sunxi/cortexa53/config-5.10 | 2 | ||||
-rw-r--r-- | target/linux/sunxi/cortexa53/config-5.15 | 2 | ||||
-rw-r--r-- | target/linux/sunxi/cortexa7/config-5.10 | 2 | ||||
-rw-r--r-- | target/linux/sunxi/cortexa7/config-5.15 | 2 | ||||
-rw-r--r-- | target/linux/sunxi/cortexa8/config-5.10 | 2 | ||||
-rw-r--r-- | target/linux/sunxi/cortexa8/config-5.15 | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/sunxi/cortexa53/config-5.10 b/target/linux/sunxi/cortexa53/config-5.10 index d4bfaa45a2..958ad1addb 100644 --- a/target/linux/sunxi/cortexa53/config-5.10 +++ b/target/linux/sunxi/cortexa53/config-5.10 @@ -29,9 +29,11 @@ CONFIG_CRYPTO_AES_ARM64=y CONFIG_CRYPTO_AES_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SIMD=y CONFIG_DMA_DIRECT_REMAP=y diff --git a/target/linux/sunxi/cortexa53/config-5.15 b/target/linux/sunxi/cortexa53/config-5.15 index 7a15b495ad..00a3d971fd 100644 --- a/target/linux/sunxi/cortexa53/config-5.15 +++ b/target/linux/sunxi/cortexa53/config-5.15 @@ -27,9 +27,11 @@ CONFIG_CRYPTO_AES_ARM64=y CONFIG_CRYPTO_AES_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SIMD=y CONFIG_DMA_DIRECT_REMAP=y diff --git a/target/linux/sunxi/cortexa7/config-5.10 b/target/linux/sunxi/cortexa7/config-5.10 index c3ceb99c3d..90e977b566 100644 --- a/target/linux/sunxi/cortexa7/config-5.10 +++ b/target/linux/sunxi/cortexa7/config-5.10 @@ -1,5 +1,7 @@ CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_DWMAC_SUN8I=y CONFIG_GRO_CELLS=y # CONFIG_MACH_SUN4I is not set diff --git a/target/linux/sunxi/cortexa7/config-5.15 b/target/linux/sunxi/cortexa7/config-5.15 index 31bb4d9f1a..e911da4c3d 100644 --- a/target/linux/sunxi/cortexa7/config-5.15 +++ b/target/linux/sunxi/cortexa7/config-5.15 @@ -1,5 +1,7 @@ CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y +CONFIG_CRYPTO_BLAKE2S_ARM=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_DWMAC_SUN8I=y CONFIG_GRO_CELLS=y # CONFIG_MACH_SUN4I is not set diff --git a/target/linux/sunxi/cortexa8/config-5.10 b/target/linux/sunxi/cortexa8/config-5.10 index 579c81c3dc..5dab93095d 100644 --- a/target/linux/sunxi/cortexa8/config-5.10 +++ b/target/linux/sunxi/cortexa8/config-5.10 @@ -1,4 +1,6 @@ # CONFIG_ARM_LPAE is not set +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y # CONFIG_MACH_SUN6I is not set # CONFIG_MACH_SUN7I is not set # CONFIG_MACH_SUN8I is not set diff --git a/target/linux/sunxi/cortexa8/config-5.15 b/target/linux/sunxi/cortexa8/config-5.15 index 579c81c3dc..b893b3142e 100644 --- a/target/linux/sunxi/cortexa8/config-5.15 +++ b/target/linux/sunxi/cortexa8/config-5.15 @@ -1,4 +1,6 @@ # CONFIG_ARM_LPAE is not set +CONFIG_CRYPTO_BLAKE2S_ARM=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y # CONFIG_MACH_SUN6I is not set # CONFIG_MACH_SUN7I is not set # CONFIG_MACH_SUN8I is not set |