From 0a1b5faebed1d118dc5802922ce573e855cd91b6 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Fri, 30 Oct 2020 14:21:56 +0000 Subject: [PATCH] linux-fslc-imx: set CRYPTO_XTS to built-in Commit [24543df3f4912] in upstream kernel (v5.4.73) sets CRYPTO_XTS as a fallback to provide 16 bytes IVs for certain CAAM module versions. This config parameter is defined as (m) in defconfig, and conflicts with new required value (y). Change the CRYPTO_XTS to (y) to fulfill new dependency requirement for both arm32 and aarch64 build configurations. Cc: Tom Hochstein Signed-off-by: Andrey Zhizhikin --- recipes-kernel/linux/linux-fslc-imx/imx/defconfig | 2 +- recipes-kernel/linux/linux-fslc-imx/mx8/defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig index 30792d23..742400a9 100644 --- a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig @@ -524,7 +524,7 @@ CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_OFB=m -CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_RMD128=m diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig index cf8df95f..1e9ee4f8 100644 --- a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig @@ -802,7 +802,7 @@ CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_OFB=m -CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_RMD128=m -- 2.40.1