diff options
| -rw-r--r-- | package/mtd/Config.in | 49 | ||||
| -rw-r--r-- | package/mtd/mtd.mk | 11 |
2 files changed, 45 insertions, 15 deletions
diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 37e4b4ab1b..590ca7f5ef 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -7,8 +7,8 @@ config BR2_PACKAGE_MTD if BR2_PACKAGE_MTD -# The three hidden options below match mtd configure script options -# --enable-jffs, --enable-ubifs and --enable-tests. +# The two hidden options below match mtd configure script options +# --enable-jffs and --enable-ubifs config BR2_PACKAGE_MTD_JFFS_UTILS bool @@ -22,10 +22,6 @@ config BR2_PACKAGE_MTD_UBIFS_UTILS select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_ZLIB -config BR2_PACKAGE_MTD_TESTS - bool - depends on BR2_TOOLCHAIN_HAS_THREADS - comment "MTD tools selection" config BR2_PACKAGE_MTD_DOCFDISK @@ -173,16 +169,43 @@ config BR2_PACKAGE_MTD_UBIBLOCK bool "ubiblock" default y +config BR2_PACKAGE_MTD_TESTS + bool "MTD test tools" + depends on BR2_USE_MMU # fork() in fstests + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Build and install tools for testing MTD devices and drivers. + +if BR2_PACKAGE_MTD_TESTS + +config BR2_PACKAGE_MTD_FLASH_READTEST + bool "flash_readtest" + +config BR2_PACKAGE_MTD_FLASH_SPEED + bool "flash_speed" + +config BR2_PACKAGE_MTD_FLASH_STRESS + bool "flash_stress" + +config BR2_PACKAGE_MTD_FLASH_TORTURE + bool "flash_torture" + config BR2_PACKAGE_MTD_INTEGCK bool "integck" - depends on BR2_TOOLCHAIN_HAS_THREADS # mtd-tests - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_MTD_TESTS - help - Install the integck test program. -comment "integck needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_MTD_NANDBITERRS + bool "nandbiterrs" + +config BR2_PACKAGE_MTD_NANDPAGETEST + bool "nandpagetest" + +config BR2_PACKAGE_MTD_NANDSUBPAGETEST + bool "nandsubpagetest" + +endif + +comment "MTD test tools need a toolchain w/ threads" depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS endif diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index e666bf077c..a69ef4082e 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -26,9 +26,9 @@ MTD_CONF_OPTS += --without-ubifs endif ifeq ($(BR2_PACKAGE_MTD_TESTS),y) -MTD_CONF_OPTS += --enable-tests +MTD_CONF_OPTS += --enable-tests --enable-install-tests else -MTD_CONF_OPTS += --disable-tests +MTD_CONF_OPTS += --disable-tests --disable-install-tests endif ifeq ($(BR2_PACKAGE_BUSYBOX),y) @@ -90,7 +90,14 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_READTEST) += flash_readtest +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_SPEED) += flash_speed +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_STRESS) += flash_stress +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_TORTURE) += flash_torture MTD_TARGETS_$(BR2_PACKAGE_MTD_INTEGCK) += integck +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDBITERRS) += nandbiterrs +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDPAGETEST) += nandpagetest +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDSUBPAGETEST) += nandsubpagetest define MTD_INSTALL_TARGET_CMDS $(foreach f,$(MTD_TARGETS_y), \ |
