diff options
author | Alistair Delva <adelva@google.com> | 2020-05-01 09:07:07 -0700 |
---|---|---|
committer | Alistair Delva <adelva@google.com> | 2020-05-01 13:42:59 -0700 |
commit | 0301347d1022e600e0d65372b58938f5914a302b (patch) | |
tree | 9fd696640b4490bd21ea8f6989b31b6a5d9b5b5d | |
parent | 7df9f55ed6f1b2458b7e8938694f8ebc106b101d (diff) |
ANDROID: cuttlefish_defconfig: Fix dm-verity related optionsASB-2020-05-05_4.19-q
Use the suggestions mentioned in the APEX documentation
https://source.android.com/devices/tech/ota/apex
Also, enable DM_VERITY_AVB on x86, which was incorrectly disabled.
Change-Id: Id9e1b0bf525802dd67a9bf4b7c6c6408e87948fd
Signed-off-by: Alistair Delva <adelva@google.com>
-rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 1 | ||||
-rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 669d47f36d5a..bfdcb7c21588 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -204,6 +204,7 @@ CONFIG_DEBUG_DEVRES=y CONFIG_OF_UNITTEST=y CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_VIRTIO_BLK=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 99d521a997d4..f0e8f22e6489 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -215,6 +215,7 @@ CONFIG_OF_UNITTEST=y # CONFIG_PNP_DEBUG_MESSAGES is not set CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_VIRTIO_BLK=y |