From 9c609080b0318bf77ffb44961c1e174cf861f588 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Mon, 20 Jun 2022 14:49:45 +0200 Subject: 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 (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 (cherry picked from commit 539e60539a2fde6531bd179c94bb9c7f8f490f2b) --- target/linux/x86/64/config-5.10 | 2 ++ target/linux/x86/config-5.10 | 4 ++-- target/linux/x86/generic/config-5.10 | 2 ++ target/linux/x86/geode/config-5.10 | 2 ++ target/linux/x86/legacy/config-5.10 | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) (limited to 'target/linux/x86') diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/64/config-5.10 index 5aac4aa7e2..eb0b08c477 100644 --- a/target/linux/x86/64/config-5.10 +++ b/target/linux/x86/64/config-5.10 @@ -65,6 +65,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_RMAP=y CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_BLAKE2S_X86=y # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set @@ -77,6 +78,7 @@ CONFIG_CRYPTO_CRYPTD=y # CONFIG_CRYPTO_DES3_EDE_X86_64 is not set CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_GLUE_HELPER_X86=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_LRW=y # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set diff --git a/target/linux/x86/config-5.10 b/target/linux/x86/config-5.10 index ec27bb7945..d60f3d8303 100644 --- a/target/linux/x86/config-5.10 +++ b/target/linux/x86/config-5.10 @@ -64,9 +64,11 @@ CONFIG_CPU_SUP_UMC_32=y CONFIG_CPU_SUP_ZHAOXIN=y CONFIG_CRASH_CORE=y CONFIG_CRC16=y +CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32_PCLMUL is not set +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_SERPENT_SSE2_586 is not set @@ -157,7 +159,6 @@ CONFIG_HW_RANDOM_VIA=y # CONFIG_HYPERVISOR_GUEST is not set CONFIG_HZ_PERIODIC=y CONFIG_I8253_LOCK=y -# CONFIG_I8K is not set CONFIG_IA32_FEAT_CTL=y # CONFIG_IB700_WDT is not set # CONFIG_IBMASR is not set @@ -168,7 +169,6 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y -# CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_PCH_THERMAL is not set # CONFIG_INTEL_POWERCLAMP is not set # CONFIG_INTEL_SCU_PCI is not set diff --git a/target/linux/x86/generic/config-5.10 b/target/linux/x86/generic/config-5.10 index 2b57cffd0a..7bfe8b4004 100644 --- a/target/linux/x86/generic/config-5.10 +++ b/target/linux/x86/generic/config-5.10 @@ -59,6 +59,8 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_RMAP=y +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DMA_ACPI=y CONFIG_DMA_OPS=y diff --git a/target/linux/x86/geode/config-5.10 b/target/linux/x86/geode/config-5.10 index 70c44ddd01..372630c102 100644 --- a/target/linux/x86/geode/config-5.10 +++ b/target/linux/x86/geode/config-5.10 @@ -35,6 +35,8 @@ CONFIG_ACPI_THERMAL=y CONFIG_ALIX=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y # CONFIG_ATA_PIIX is not set +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CS5535_CLOCK_EVENT_SRC=y CONFIG_CS5535_MFGPT=y CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 diff --git a/target/linux/x86/legacy/config-5.10 b/target/linux/x86/legacy/config-5.10 index 310764d8e8..12330ba92f 100644 --- a/target/linux/x86/legacy/config-5.10 +++ b/target/linux/x86/legacy/config-5.10 @@ -43,6 +43,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BLK_DEV_SR=y CONFIG_CDROM=y CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_DMA_ACPI=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DRM=y -- cgit v1.2.3