aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-05-13 02:43:27 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-05-13 02:43:27 +0000
commit9305cdddbf83ed11fc8164e7f1e624538611be22 (patch)
tree17fdc564a28838e1bd5fd4265af23ecc1aa5a990
parent77ad97f199f1bf05e9a7609bbdd239dab825b258 (diff)
downloadbusybox-9305cdddbf83ed11fc8164e7f1e624538611be22.tar.gz
busybox-9305cdddbf83ed11fc8164e7f1e624538611be22.tar.bz2
Kill CONFIG_NITPICK, it turned out to not be useful. no code changes.
-rw-r--r--Config.in18
-rw-r--r--TODO_config_nommu1
-rw-r--r--modutils/Config.in4
-rw-r--r--scripts/defconfig1
4 files changed, 2 insertions, 22 deletions
diff --git a/Config.in b/Config.in
index a3354eb59..5ce642ff3 100644
--- a/Config.in
+++ b/Config.in
@@ -13,22 +13,6 @@ menu "Busybox Settings"
menu "General Configuration"
-config NITPICK
- bool "See lots more (probably unnecessary) configuration options."
- default n
- help
- Some BusyBox applets have more configuration options than anyone
- will ever care about. To avoid drowining people in complexity, most
- of the applet features that can be set to a sane default value are
- hidden, unless you hit the above switch.
-
- This is better than to telling people to edit the busybox source
- code, but not by much.
-
- See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet
-
- You have been warned.
-
config DESKTOP
bool "Enable options for full-blown desktop systems"
default n
@@ -40,7 +24,6 @@ config DESKTOP
choice
prompt "Buffer allocation policy"
default FEATURE_BUFFERS_USE_MALLOC
- depends on NITPICK
help
There are 3 ways BusyBox can handle buffer allocations:
- Use malloc. This costs code size for the call to xmalloc.
@@ -130,7 +113,6 @@ config FEATURE_DEVPTS
config FEATURE_CLEAN_UP
bool "Clean up all memory before exiting (usually not needed)"
default n
- depends on NITPICK
help
As a size optimization, busybox normally exits without explicitly
freeing dynamically allocated memory or closing files. This saves
diff --git a/TODO_config_nommu b/TODO_config_nommu
index 3cbe7f415..308e5d7fa 100644
--- a/TODO_config_nommu
+++ b/TODO_config_nommu
@@ -12,7 +12,6 @@ CONFIG_HAVE_DOT_CONFIG=y
#
# General Configuration
#
-CONFIG_NITPICK=y
CONFIG_DESKTOP=y
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
diff --git a/modutils/Config.in b/modutils/Config.in
index 364ec2459..b2ef51a05 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -92,7 +92,7 @@ config MODPROBE
config FEATURE_MODPROBE_MULTIPLE_OPTIONS
bool
- prompt "Multiple options parsing" if NITPICK
+ prompt "Multiple options parsing"
default y
depends on MODPROBE
help
@@ -109,7 +109,7 @@ config FEATURE_MODPROBE_MULTIPLE_OPTIONS
config FEATURE_MODPROBE_FANCY_ALIAS
bool
- prompt "Fancy alias parsing" if NITPICK
+ prompt "Fancy alias parsing"
default y
depends on MODPROBE && FEATURE_2_6_MODULES
help
diff --git a/scripts/defconfig b/scripts/defconfig
index 26cc8d25d..007c7609b 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -12,7 +12,6 @@ CONFIG_HAVE_DOT_CONFIG=y
#
# General Configuration
#
-CONFIG_NITPICK=y
# CONFIG_DESKTOP is not set
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set