diff options
| author | Trilok Soni <tsoni@codeaurora.org> | 2016-04-21 15:46:42 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-05 15:05:52 -0700 |
| commit | 1ca0992ef1eef332496c6e0496a4f49f31ab1c23 (patch) | |
| tree | a321e2e91942164197de09f6cf5941675496cb78 | |
| parent | 587dc80c8cb3747a240eb0eb5b5a4a17e8b7163e (diff) | |
lib: memtest: Add MEMTEST_ENABLE_DEFAULT option
As of now memtest remains disabled until we specify the patterns
through the kernel command line. Some platforms have two
different configurations files (one for debug and another for
product) which can use the configuration option to enable the
memtest by default (in the debug configuration file).
CRs-Fixed: 1007344
Change-Id: I0bf7b33c3584f3d6cf5ef58dfe72be46212041da
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
| -rw-r--r-- | lib/Kconfig.debug | 13 | ||||
| -rw-r--r-- | mm/memtest.c | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 902846958945..4b8c3bff7cfd 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1941,6 +1941,19 @@ config MEMTEST memtest=17, mean do 17 test patterns. If you are unsure how to answer this question, answer N. +config MEMTEST_ENABLE_DEFAULT + int "Enable Memtest pattern test by default? (0-17)" + range 0 17 + default "0" + depends on MEMTEST + help + This option helps to select Memtest to be enabled through + kernel defconfig options. Alternatively it can be enabled + using memtest=<patterns> kernel command line. + + Default value is kept as "0" so that it is kept as disabled. + To enable enter any value between 1-17 range. + config TEST_STATIC_KEYS tristate "Test static keys" default n diff --git a/mm/memtest.c b/mm/memtest.c index 8eaa4c3a5f65..15a423eb0c29 100644 --- a/mm/memtest.c +++ b/mm/memtest.c @@ -80,8 +80,8 @@ static void __init do_one_pass(u64 pattern, phys_addr_t start, phys_addr_t end) } /* default is disabled */ -static unsigned int memtest_pattern __initdata; - +static unsigned int memtest_pattern __initdata = + CONFIG_MEMTEST_ENABLE_DEFAULT; static int __init parse_memtest(char *arg) { int ret = 0; |