ANDROID: android-verity: do not compile as independent module

dm-android-verity depends on optional kernel command line parameters.
When compiled as module the __setup macro ends up being a no-op
resulting in the following warnings:

/work/build/batch/drivers/md/dm-android-verity.c:91:19: warning: 'verity_buildvariant' defined but not used [-Wunused-function]
 static int __init verity_buildvariant(char *line)
                   ^~~~~~~~~~~~~~~~~~~
/work/build/batch/drivers/md/dm-android-verity.c:83:19: warning: 'verity_keyid_param' defined but not used [-Wunused-function]
 static int __init verity_keyid_param(char *line)
                   ^~~~~~~~~~~~~~~~~~
/work/build/batch/drivers/md/dm-android-verity.c:75:19: warning: 'verity_mode_param' defined but not used [-Wunused-function]
 static int __init verity_mode_param(char *line)
                   ^~~~~~~~~~~~~~~~~
/work/build/batch/drivers/md/dm-android-verity.c:67:19: warning: 'verified_boot_state_param' defined but not used [-Wunused-function]
 static int __init verified_boot_state_param(char *line)
                   ^~~~~~~~~~~~~~~~~~~~~~~~~
Tested with allmodconfig.

Change-Id: Idfe0c97b216bb620cc7264e968b494eb3a765157
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 3d237a03dab3dbd2ead85526a76e8ddcf9271f2d..9eb08a43cd277cfb6d5724b2463e1836b1ab306b 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -516,15 +516,15 @@ config DM_LOG_WRITES
          If unsure, say N.
 
 config DM_ANDROID_VERITY
-       tristate "Android verity target support"
-       depends on DM_VERITY
+       bool "Android verity target support"
+       depends on DM_VERITY=y
        depends on X509_CERTIFICATE_PARSER
        depends on SYSTEM_TRUSTED_KEYRING
        depends on PUBLIC_KEY_ALGO_RSA
        depends on KEYS
        depends on ASYMMETRIC_KEY_TYPE
        depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-       depends on MD_LINEAR
+       depends on MD_LINEAR=y
        select DM_VERITY_HASH_PREFETCH_MIN_SIZE_128
        ---help---
          This device-mapper target is virtually a VERITY target. This