From 6c3c959b1b6769f7502567787274be857d4ec05f Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Fri, 3 Apr 2026 22:33:38 +0800 Subject: [PATCH] kernel: 6.18: move CONFIG_CRYPTO_LIB_SHA256 to generic This symbol is selected by CONFIG_BPF, which was already enabled on generic config-6.18. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/22730 Signed-off-by: Hauke Mehrtens --- target/linux/generic/config-6.18 | 1 + target/linux/malta/config-6.18 | 1 - target/linux/microchipsw/lan969x/config-6.18 | 1 - target/linux/realtek/rtl838x/config-6.18 | 1 - target/linux/realtek/rtl839x/config-6.18 | 1 - target/linux/realtek/rtl930x/config-6.18 | 1 - target/linux/realtek/rtl930x_nand/config-6.18 | 1 - target/linux/realtek/rtl931x/config-6.18 | 1 - target/linux/realtek/rtl931x_nand/config-6.18 | 1 - target/linux/x86/config-6.18 | 1 - 10 files changed, 1 insertion(+), 9 deletions(-) diff --git a/target/linux/generic/config-6.18 b/target/linux/generic/config-6.18 index 60c58962b0f..093d48af7fc 100644 --- a/target/linux/generic/config-6.18 +++ b/target/linux/generic/config-6.18 @@ -1243,6 +1243,7 @@ CONFIG_CRYPTO_LIB_ARC4=y # CONFIG_CRYPTO_LIB_CURVE25519 is not set # CONFIG_CRYPTO_LIB_POLY1305 is not set CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 +CONFIG_CRYPTO_LIB_SHA256=y # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set diff --git a/target/linux/malta/config-6.18 b/target/linux/malta/config-6.18 index 1b0252cd436..e424cb813e9 100644 --- a/target/linux/malta/config-6.18 +++ b/target/linux/malta/config-6.18 @@ -67,7 +67,6 @@ CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y diff --git a/target/linux/microchipsw/lan969x/config-6.18 b/target/linux/microchipsw/lan969x/config-6.18 index bdfa9ab09a3..a0bbaf3fc70 100644 --- a/target/linux/microchipsw/lan969x/config-6.18 +++ b/target/linux/microchipsw/lan969x/config-6.18 @@ -67,7 +67,6 @@ CONFIG_CRYPTO_DEV_ATMEL_AES=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_LIB_GF128MUL=y -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_SHA256_ARCH=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_DCACHE_WORD_ACCESS=y diff --git a/target/linux/realtek/rtl838x/config-6.18 b/target/linux/realtek/rtl838x/config-6.18 index afd7b042991..714417e555d 100644 --- a/target/linux/realtek/rtl838x/config-6.18 +++ b/target/linux/realtek/rtl838x/config-6.18 @@ -48,7 +48,6 @@ CONFIG_CPU_SUPPORTS_MSA=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_SECTION_MISMATCH=y diff --git a/target/linux/realtek/rtl839x/config-6.18 b/target/linux/realtek/rtl839x/config-6.18 index 518a9254b17..c0912804c28 100644 --- a/target/linux/realtek/rtl839x/config-6.18 +++ b/target/linux/realtek/rtl839x/config-6.18 @@ -51,7 +51,6 @@ CONFIG_CPU_SUPPORTS_MSA=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_SECTION_MISMATCH=y diff --git a/target/linux/realtek/rtl930x/config-6.18 b/target/linux/realtek/rtl930x/config-6.18 index b237ec3c49e..69ddd0e7e28 100644 --- a/target/linux/realtek/rtl930x/config-6.18 +++ b/target/linux/realtek/rtl930x/config-6.18 @@ -38,7 +38,6 @@ CONFIG_CRC_ITU_T=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_SECTION_MISMATCH=y diff --git a/target/linux/realtek/rtl930x_nand/config-6.18 b/target/linux/realtek/rtl930x_nand/config-6.18 index 401cc44754d..765b500c23d 100644 --- a/target/linux/realtek/rtl930x_nand/config-6.18 +++ b/target/linux/realtek/rtl930x_nand/config-6.18 @@ -41,7 +41,6 @@ CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_ZSTD=y diff --git a/target/linux/realtek/rtl931x/config-6.18 b/target/linux/realtek/rtl931x/config-6.18 index d22b51b7666..5520ff3f355 100644 --- a/target/linux/realtek/rtl931x/config-6.18 +++ b/target/linux/realtek/rtl931x/config-6.18 @@ -41,7 +41,6 @@ CONFIG_CPU_SUPPORTS_MSA=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_SECTION_MISMATCH=y diff --git a/target/linux/realtek/rtl931x_nand/config-6.18 b/target/linux/realtek/rtl931x_nand/config-6.18 index 527a8f82a7e..bc08c5f30e4 100644 --- a/target/linux/realtek/rtl931x_nand/config-6.18 +++ b/target/linux/realtek/rtl931x_nand/config-6.18 @@ -44,7 +44,6 @@ CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_ZSTD=y diff --git a/target/linux/x86/config-6.18 b/target/linux/x86/config-6.18 index cf4d194a9fa..8c9aed98c9d 100644 --- a/target/linux/x86/config-6.18 +++ b/target/linux/x86/config-6.18 @@ -85,7 +85,6 @@ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_LIB_SHA1=y -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y # CONFIG_CRYPTO_SERPENT_SSE2_586 is not set # CONFIG_CX_ECAT is not set