summaryrefslogtreecommitdiffstats
path: root/kernel/configs/android-recommended.config
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-10-11 22:54:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-12 00:06:32 +0200
commitf023a3956f273859ed36f624f75a66c272124b16 (patch)
treef5bbb57075e026783bdc4e65abb145d35c0f7379 /kernel/configs/android-recommended.config
parentconfig/android: Remove CONFIG_IPV6_PRIVACY (diff)
downloadlinux-f023a3956f273859ed36f624f75a66c272124b16.tar.xz
linux-f023a3956f273859ed36f624f75a66c272124b16.zip
config: android: move device mapper options to recommended
CONFIG_MD is in recommended, but other dependent options like DM_CRYPT and DM_VERITY options are in base. The result is the options in base don't get enabled when applying both base and recommended fragments. Move all the options to recommended. Link: http://lkml.kernel.org/r/20160908185934.18098-1-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: John Stultz <john.stultz@linaro.org> Cc: Amit Pundir <amit.pundir@linaro.org> Cc: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/configs/android-recommended.config')
-rw-r--r--kernel/configs/android-recommended.config4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config
index e3b953e966d2..297756be369c 100644
--- a/kernel/configs/android-recommended.config
+++ b/kernel/configs/android-recommended.config
@@ -6,12 +6,16 @@
# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_COMPACTION=y
CONFIG_DEBUG_RODATA=y
+CONFIG_DM_CRYPT=y
CONFIG_DM_UEVENT=y
+CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY_FEC=y
CONFIG_DRAGONRISE_FF=y
CONFIG_ENABLE_DEFAULT_TRACERS=y
CONFIG_EXT4_FS=y