From ee70434a0e22661aab9b4cd1ed1f9eb09f55d407 Mon Sep 17 00:00:00 2001 From: Bian Jin chen Date: Tue, 6 Apr 2021 20:03:48 +0800 Subject: [PATCH] arm64: rockchip_defconfig: Enable metadata FBE. Android 11 requires metadata File Base Encryption to protect userdata. +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y +CONFIG_DM_DEFAULT_KEY=y +CONFIG_MMC_CRYPTO=y +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y Signed-off-by: Bian Jin chen Change-Id: I2a741aa3d46f64375400c6fe8d7fac66b48eecad --- arch/arm64/configs/rockchip_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index e088eb4e2748..545bb337bcd5 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -107,6 +107,8 @@ CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y # CONFIG_IOSCHED_DEADLINE is not set @@ -282,6 +284,7 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y +CONFIG_DM_DEFAULT_KEY=y CONFIG_DM_SNAPSHOT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y @@ -780,6 +783,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 +CONFIG_MMC_CRYPTO=y CONFIG_SDIO_KEEPALIVE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y @@ -872,6 +876,7 @@ CONFIG_EXT4_ENCRYPTION=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_SECURITY=y CONFIG_F2FS_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y CONFIG_FS_VERITY=y CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y CONFIG_QUOTA=y