aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
diff options
context:
space:
mode:
authorTomasz Maciej Nowak <tmn505@gmail.com>2022-06-20 14:49:45 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commit9c609080b0318bf77ffb44961c1e174cf861f588 (patch)
treefff10ada520b9b88b54e576171fe4eb684b8217b /target/linux/sunxi
parent63b4881fcbed021516931137c6e2131e0aa7b9d5 (diff)
downloadupstream-9c609080b0318bf77ffb44961c1e174cf861f588.tar.gz
upstream-9c609080b0318bf77ffb44961c1e174cf861f588.tar.bz2
upstream-9c609080b0318bf77ffb44961c1e174cf861f588.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> (cherry picked from commit 539e60539a2fde6531bd179c94bb9c7f8f490f2b)
Diffstat (limited to 'target/linux/sunxi')
-rw-r--r--target/linux/sunxi/cortexa53/config-5.102
-rw-r--r--target/linux/sunxi/cortexa7/config-5.102
-rw-r--r--target/linux/sunxi/cortexa8/config-5.102
3 files changed, 6 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/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/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