Merge branch 'busybox' into merge

1 files changed, 19 insertions, 0 deletions

diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c
index 1fefd95f9..2f698641f 100644
--- a/miscutils/flash_lock_unlock.c
+++ b/miscutils/flash_lock_unlock.c
@@ -3,6 +3,25 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+//config:config FLASH_LOCK
+//config:       bool "flash_lock"
+//config:       default n  # doesn't build on Ubuntu 8.04
+//config:       help
+//config:         The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
+//config:         utility locks part or all of the flash device.
+//config:
+//config:config FLASH_UNLOCK
+//config:       bool "flash_unlock"
+//config:       default n  # doesn't build on Ubuntu 8.04
+//config:       help
+//config:         The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
+//config:         utility unlocks part or all of the flash device.
+
+//applet:IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock))
+//applet:IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock))
+
+//kbuild:lib-$(CONFIG_FLASH_LOCK) += flash_lock_unlock.o
+//kbuild:lib-$(CONFIG_FLASH_UNLOCK) += flash_lock_unlock.o
 
 //usage:#define flash_lock_trivial_usage
 //usage:       "MTD_DEVICE OFFSET SECTORS"