]> code.ossystems Code Review - meta-freescale.git/commitdiff
linux-fslc-imx: set CRYPTO_XTS to built-in
authorAndrey Zhizhikin <andrey.z@gmail.com>
Fri, 30 Oct 2020 14:21:56 +0000 (14:21 +0000)
committerOtavio Salvador <otavio@ossystems.com.br>
Fri, 30 Oct 2020 14:54:30 +0000 (11:54 -0300)
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 <tom.hochstein@nxp.com>
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
(cherry picked from commit 0a1b5faebed1d118dc5802922ce573e855cd91b6)

recipes-kernel/linux/linux-fslc-imx/imx/defconfig
recipes-kernel/linux/linux-fslc-imx/mx8/defconfig

index 30792d235072514482ecd58002bd86a818dacc56..742400a9019bdd07d19833c427aca318eb50dba0 100644 (file)
@@ -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
index cf8df95f0c17aed9719f9109c8ecbfdd0f6d97de..1e9ee4f81027defbb803f53155dca9b1a00b1751 100644 (file)
@@ -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