Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57cdc5a0 authored May 14, 2020 by Eric Biggers

ANDROID: Revert "ANDROID: GKI: gki_defconfig: CONFIG_DM_DEFAULT_KEY=m"



This reverts commit 7fc2fedd.

There's actually no need for vendors to override dm-default-key.

Bug: 154836329
Bug: 156673772
Change-Id: Id7fd2b970f0526949934102b9aba48d3a12f579b
Signed-off-by: Eric Biggers <ebiggers@google.com>

parent bedd8821

arch/arm64/configs/gki_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/configs/gki_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -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