From 792b18282ae51cd915c2457e3df8a271f118b178 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 24 Jan 2020 11:33:42 -0800 Subject: [PATCH] ANDROID: gki_defconfig: enable dm-default-key dm-default-key is needed for metadata encryption (https://source.android.com/security/encryption/metadata). The new version of dm-default-key is vendor-independent and can be used both with and without inline encryption hardware. Bug: 137270441 Bug: 147814592 Change-Id: I92ce45c4b1543ff8bc5cdb5ebe4ddcdb740c2dc7 Signed-off-by: Eric Biggers --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 2dfca5fadae2..d3adc286462c 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -234,6 +234,7 @@ CONFIG_SCSI_UFS_CRYPTO=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 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 1cb7ecc48430..f3b43e3e8aff 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -204,6 +204,7 @@ CONFIG_BLK_DEV_SD=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