9
0
Fork 0

Merge branch 'for-next/testing-menu'

This commit is contained in:
Sascha Hauer 2012-10-03 21:13:11 +02:00
commit 2385424e30
1 changed files with 21 additions and 17 deletions

View File

@ -192,14 +192,6 @@ config CMD_NAND
depends on NAND
prompt "nand"
config CMD_NANDTEST
tristate
depends on NAND
depends on PARTITION
depends on NAND_ECC_HW || NAND_ECC_SOFT
select PARTITION_NEED_MTD
prompt "nandtest"
config CMD_AUTOMOUNT
tristate
select FS_AUTOMOUNT
@ -327,15 +319,6 @@ config CMD_SHA224SUM
select SHA224
prompt "sha224sum"
config CMD_MTEST
tristate
prompt "mtest"
config CMD_MTEST_ALTERNATIVE
bool
depends on CMD_MTEST
prompt "alternative mtest implementation"
endmenu
menu "flash "
@ -482,6 +465,27 @@ config CMD_OFTREE_PROBE
endmenu
menu "testing "
config CMD_NANDTEST
tristate
depends on NAND
depends on PARTITION
depends on NAND_ECC_HW || NAND_ECC_SOFT
select PARTITION_NEED_MTD
prompt "nandtest"
config CMD_MTEST
tristate
prompt "mtest"
config CMD_MTEST_ALTERNATIVE
bool
depends on CMD_MTEST
prompt "alternative mtest implementation"
endmenu
config CMD_TIMEOUT
tristate
prompt "timeout"