From 57cdc5a002148707eb5d7dd337f99e109693e414 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 14 May 2020 15:37:37 -0700 Subject: [PATCH] ANDROID: Revert "ANDROID: GKI: gki_defconfig: CONFIG_DM_DEFAULT_KEY=m" This reverts commit 7fc2fedd659c1c1c77878daf3483d17f2e3490ce. There's actually no need for vendors to override dm-default-key. Bug: 154836329 Bug: 156673772 Change-Id: Id7fd2b970f0526949934102b9aba48d3a12f579b Signed-off-by: Eric Biggers --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9670ab766172..bd76c6bf5678 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -237,7 +237,7 @@ CONFIG_SCSI_UFS_CRYPTO=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y -CONFIG_DM_DEFAULT_KEY=m +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 b7e737747b8c..7cea113ebea3 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -202,7 +202,7 @@ CONFIG_CHR_DEV_SG=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y -CONFIG_DM_DEFAULT_KEY=m +CONFIG_DM_DEFAULT_KEY=y CONFIG_DM_SNAPSHOT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y