aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-05-13 02:43:27 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-05-13 02:43:27 +0000
commit9305cdddbf83ed11fc8164e7f1e624538611be22 (patch)
tree17fdc564a28838e1bd5fd4265af23ecc1aa5a990
parent77ad97f199f1bf05e9a7609bbdd239dab825b258 (diff)
downloadbusybox-w32-9305cdddbf83ed11fc8164e7f1e624538611be22.tar.gz
busybox-w32-9305cdddbf83ed11fc8164e7f1e624538611be22.tar.bz2
busybox-w32-9305cdddbf83ed11fc8164e7f1e624538611be22.zip
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"
13 13
14menu "General Configuration" 14menu "General Configuration"
15 15
16config NITPICK
17 bool "See lots more (probably unnecessary) configuration options."
18 default n
19 help
20 Some BusyBox applets have more configuration options than anyone
21 will ever care about. To avoid drowining people in complexity, most
22 of the applet features that can be set to a sane default value are
23 hidden, unless you hit the above switch.
24
25 This is better than to telling people to edit the busybox source
26 code, but not by much.
27
28 See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet
29
30 You have been warned.
31
32config DESKTOP 16config DESKTOP
33 bool "Enable options for full-blown desktop systems" 17 bool "Enable options for full-blown desktop systems"
34 default n 18 default n
@@ -40,7 +24,6 @@ config DESKTOP
40choice 24choice
41 prompt "Buffer allocation policy" 25 prompt "Buffer allocation policy"
42 default FEATURE_BUFFERS_USE_MALLOC 26 default FEATURE_BUFFERS_USE_MALLOC
43 depends on NITPICK
44 help 27 help
45 There are 3 ways BusyBox can handle buffer allocations: 28 There are 3 ways BusyBox can handle buffer allocations:
46 - Use malloc. This costs code size for the call to xmalloc. 29 - Use malloc. This costs code size for the call to xmalloc.
@@ -130,7 +113,6 @@ config FEATURE_DEVPTS
130config FEATURE_CLEAN_UP 113config FEATURE_CLEAN_UP
131 bool "Clean up all memory before exiting (usually not needed)" 114 bool "Clean up all memory before exiting (usually not needed)"
132 default n 115 default n
133 depends on NITPICK
134 help 116 help
135 As a size optimization, busybox normally exits without explicitly 117 As a size optimization, busybox normally exits without explicitly
136 freeing dynamically allocated memory or closing files. This saves 118 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
12# 12#
13# General Configuration 13# General Configuration
14# 14#
15CONFIG_NITPICK=y
16CONFIG_DESKTOP=y 15CONFIG_DESKTOP=y
17CONFIG_FEATURE_BUFFERS_USE_MALLOC=y 16CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
18# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set 17# 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
92 92
93config FEATURE_MODPROBE_MULTIPLE_OPTIONS 93config FEATURE_MODPROBE_MULTIPLE_OPTIONS
94 bool 94 bool
95 prompt "Multiple options parsing" if NITPICK 95 prompt "Multiple options parsing"
96 default y 96 default y
97 depends on MODPROBE 97 depends on MODPROBE
98 help 98 help
@@ -109,7 +109,7 @@ config FEATURE_MODPROBE_MULTIPLE_OPTIONS
109 109
110config FEATURE_MODPROBE_FANCY_ALIAS 110config FEATURE_MODPROBE_FANCY_ALIAS
111 bool 111 bool
112 prompt "Fancy alias parsing" if NITPICK 112 prompt "Fancy alias parsing"
113 default y 113 default y
114 depends on MODPROBE && FEATURE_2_6_MODULES 114 depends on MODPROBE && FEATURE_2_6_MODULES
115 help 115 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
12# 12#
13# General Configuration 13# General Configuration
14# 14#
15CONFIG_NITPICK=y
16# CONFIG_DESKTOP is not set 15# CONFIG_DESKTOP is not set
17CONFIG_FEATURE_BUFFERS_USE_MALLOC=y 16CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
18# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set 17# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set