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

Commit 8047bf5f authored by Alistair Delva's avatar Alistair Delva Committed by Akilesh Kailash
Browse files

Revert "ANDROID: AVB error handler to invalidate vbmeta partition." 



This driver is not used and can cause problems if used on modern
devices. Remove it.

This reverts commit 61156198.

Bug: 185178770
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
Change-Id: I1d5acb96dda765a1e3ea0cf62a3bf4b2a78892ea
(cherry picked from commit ce6a5172613f990c6aaef168953d1be684f86e12)
parent 6841a56b

arch/arm64/configs/gki_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ CONFIG_DM_DEFAULT_KEY=y 
CONFIG_DM_SNAPSHOT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_AVB=y

CONFIG_DM_VERITY_FEC=y

CONFIG_DM_BOW=y

CONFIG_NETDEVICES=y

arch/arm64/configs/rockpi4_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ CONFIG_BLK_DEV_DM=y 
CONFIG_DM_CRYPT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_AVB=y

CONFIG_DM_VERITY_FEC=y

CONFIG_DM_BOW=y

CONFIG_NETDEVICES=y

arch/x86/configs/gki_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ CONFIG_DM_DEFAULT_KEY=y 
CONFIG_DM_SNAPSHOT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_AVB=y

CONFIG_DM_VERITY_FEC=y

CONFIG_DM_BOW=y

CONFIG_NETDEVICES=y

drivers/md/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -538,17 +538,6 @@ config DM_VERITY_VERIFY_ROOTHASH_SIG 


	  If unsure, say N.



config DM_VERITY_AVB

	tristate "Support AVB specific verity error behavior"

	depends on DM_VERITY

	---help---

	  Enables Android Verified Boot platform-specific error

	  behavior. In particular, it will modify the vbmeta partition

	  specified on the kernel command-line when non-transient error

	  occurs (followed by a panic).



	  If unsure, say N.



config DM_VERITY_FEC

	bool "Verity forward error correction support"

	depends on DM_VERITY

drivers/md/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -82,10 +82,6 @@ ifeq ($(CONFIG_DM_UEVENT),y) 
dm-mod-objs			+= dm-uevent.o

endif



ifeq ($(CONFIG_DM_VERITY_AVB),y)

dm-verity-objs			+= dm-verity-avb.o

endif



ifeq ($(CONFIG_DM_VERITY_FEC),y)

dm-verity-objs			+= dm-verity-fec.o

endif