aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-11-24 22:30:52 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2016-11-24 22:30:52 +0100
commit24860fa09cf954704232406055d7ca291c636eab (patch)
tree5656881cfbd429ee04d9576162b57bc0a44ec39c
parent1255925a6121cc5f2f09fbe40f2434ab11cc84f7 (diff)
downloadbusybox-w32-24860fa09cf954704232406055d7ca291c636eab.tar.gz
busybox-w32-24860fa09cf954704232406055d7ca291c636eab.tar.bz2
busybox-w32-24860fa09cf954704232406055d7ca291c636eab.zip
Move FEATURE_BUFFERS_USE_foo options to library tuning
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Config.in24
-rw-r--r--libbb/Config.src24
2 files changed, 24 insertions, 24 deletions
diff --git a/Config.in b/Config.in
index 3d1759e21..924a197da 100644
--- a/Config.in
+++ b/Config.in
@@ -61,30 +61,6 @@ config PLATFORM_LINUX
61 Answering 'N' here will disable such applets and hide the 61 Answering 'N' here will disable such applets and hide the
62 corresponding configuration options. 62 corresponding configuration options.
63 63
64choice
65 prompt "Buffer allocation policy"
66 default FEATURE_BUFFERS_USE_MALLOC
67 help
68 There are 3 ways BusyBox can handle buffer allocations:
69 - Use malloc. This costs code size for the call to xmalloc.
70 - Put them on stack. For some very small machines with limited stack
71 space, this can be deadly. For most folks, this works just fine.
72 - Put them in BSS. This works beautifully for computers with a real
73 MMU (and OS support), but wastes runtime RAM for uCLinux. This
74 behavior was the only one available for BusyBox versions 0.48 and
75 earlier.
76
77config FEATURE_BUFFERS_USE_MALLOC
78 bool "Allocate with Malloc"
79
80config FEATURE_BUFFERS_GO_ON_STACK
81 bool "Allocate on the Stack"
82
83config FEATURE_BUFFERS_GO_IN_BSS
84 bool "Allocate in the .bss section"
85
86endchoice
87
88config SHOW_USAGE 64config SHOW_USAGE
89 bool "Show applet usage messages" 65 bool "Show applet usage messages"
90 default y 66 default y
diff --git a/libbb/Config.src b/libbb/Config.src
index 18a40f2ac..00804e31e 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -7,6 +7,30 @@ menu "Busybox Library Tuning"
7 7
8INSERT 8INSERT
9 9
10choice
11 prompt "Buffer allocation policy"
12 default FEATURE_BUFFERS_USE_MALLOC
13 help
14 There are 3 ways BusyBox can handle buffer allocations:
15 - Use malloc. This costs code size for the call to xmalloc.
16 - Put them on stack. For some very small machines with limited stack
17 space, this can be deadly. For most folks, this works just fine.
18 - Put them in BSS. This works beautifully for computers with a real
19 MMU (and OS support), but wastes runtime RAM for uCLinux. This
20 behavior was the only one available for BusyBox versions 0.48 and
21 earlier.
22
23config FEATURE_BUFFERS_USE_MALLOC
24 bool "Allocate with Malloc"
25
26config FEATURE_BUFFERS_GO_ON_STACK
27 bool "Allocate on the Stack"
28
29config FEATURE_BUFFERS_GO_IN_BSS
30 bool "Allocate in the .bss section"
31
32endchoice
33
10config PASSWORD_MINLEN 34config PASSWORD_MINLEN
11 int "Minimum password length" 35 int "Minimum password length"
12 default 6 36 default 6