On Wed, Feb 29, 2012 at 07:11:19PM +0100, bernh...@bwalle.de wrote: > From: Bernhard Walle <wa...@corscience.de> > > Some tools that mtd-utils provide can be also provided by busybox. Add > the dependencies here as done in other configuration files to prevent > the user from misconfiguration. > > Signed-off-by: Bernhard Walle <wa...@corscience.de> > --- > rules/mtd-utils.in | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in > index a9bab13..b05f204 100644 > --- a/rules/mtd-utils.in > +++ b/rules/mtd-utils.in > @@ -43,9 +43,13 @@ config MTD_UTILS_FLASH_ERASEALL > bool > prompt "flash_eraseall (deprecated)" > select MTD_UTILS_FLASH_ERASE > + depends on !BUSYBOX_FLASH_ERASEALL > help > ...use flash_erase instead > > +comment "flash_eraseall is disabled by busybox flash_eraseall" > + depends on BUSYBOX_FLASH_ERASEALL
please use the same wording as all the other such comments. Michael > + > config MTD_UTILS_FLASH_INFO > bool > prompt "flash_info" > @@ -55,9 +59,13 @@ config MTD_UTILS_FLASH_INFO > config MTD_UTILS_FLASH_LOCK > bool > prompt "flash_lock" > + depends on !BUSYBOX_FLASH_LOCK > help > This utility locks one or more sectors of flash device. > > +comment "flash_lock is disabled by busybox flash_lock" > + depends on BUSYBOX_FLASH_LOCK > + > config MTD_UTILS_FLASH_OTP_DUMP > bool > prompt "flash_otp_dump" > @@ -73,15 +81,23 @@ config MTD_UTILS_FLASH_OTP_INFO > config MTD_UTILS_FLASH_UNLOCK > bool > prompt "flash_unlock" > + depends on !BUSYBOX_FLASH_UNLOCK > help > This utility unlock all sectors of flash device. > > +comment "flash_unlock is disabled by busybox flash_unlock" > + depends on BUSYBOX_FLASH_UNLOCK > + > config MTD_UTILS_FLASHCP > bool > prompt "flashcp" > + depends on !BUSYBOX_FLASHCP > help > Flash Copy - Written by Abraham van der Merwe > > +comment "flashcp is disabled by busybox flashcp" > + depends on BUSYBOX_FLASHCP > + > config MTD_UTILS_FTL_CHECK > bool > prompt "ftl_check" > @@ -126,10 +142,14 @@ config MTD_UTILS_MTDDEBUG > config MTD_UTILS_NANDDUMP > bool > prompt "nanddump" > + depends on !BUSYBOX_NANDDUMP > help > This utility dumps the contents of raw NAND chips or NAND > chips contained in DoC devices. > > +comment "nanddump is disabled by busybox nanddump" > + depends on BUSYBOX_NANDDUMP > + > config MTD_UTILS_NANDTEST > bool > prompt "nandtest" > @@ -139,11 +159,15 @@ config MTD_UTILS_NANDTEST > config MTD_UTILS_NANDWRITE > bool > prompt "nandwrite" > + depends on !BUSYBOX_NANDWRITE > help > This utility writes a binary image directly to a NAND flash > chip or NAND chips contained in DoC devices. This is the > "inverse operation" of nanddump. > > +comment "nandwrite is disabled by busybox nandwrite" > + depends on BUSYBOX_NANDWRITE > + > config MTD_UTILS_NFTL_FORMAT > bool > prompt "nftl_format" > @@ -206,9 +230,13 @@ if MTD_UTILS_UBI_UTILS > config MTD_UTILS_UBIATTACH > bool > prompt "ubiattach" > + depends on !BUSYBOX_UBIATTACH > help > Attach an ubi device to a mtd device > > +comment "ubiattach is disabled by busybox ubiattach" > + depends on BUSYBOX_UBIATTACH > + > config MTD_UTILS_UBICRC32 > bool > prompt "ubicrc32" > @@ -218,9 +246,13 @@ config MTD_UTILS_UBICRC32 > config MTD_UTILS_UBIDETACH > bool > prompt "ubidetach" > + depends on !BUSYBOX_UBIDETACH > help > Detach an ubi device from a mtd device > > +comment "ubidetach is disabled by busybox nandwrite" > + depends on BUSYBOX_UBIDETACH > + > config MTD_UTILS_UBIFORMAT > bool > select GCCLIBS_GCC_S > -- > 1.7.9.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de
