author | kergoth <kergoth> | 2002-10-31 17:11:35 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-10-31 17:11:35 (UTC) |
commit | d955226c2197578f69c510282a4e9ad1ea8fe771 (patch) (unidiff) | |
tree | 0d8f210dd012559df4e3432ccc8ce96e9bd15853 /scripts/kconfig/prepare-all.diff | |
parent | 16fcb285f9ba7c514fc3f2695768a82feeb7182b (diff) | |
download | opie-d955226c2197578f69c510282a4e9ad1ea8fe771.zip opie-d955226c2197578f69c510282a4e9ad1ea8fe771.tar.gz opie-d955226c2197578f69c510282a4e9ad1ea8fe771.tar.bz2 |
Initial bits to start work on revamping the buildsystem
Diffstat (limited to 'scripts/kconfig/prepare-all.diff') (more/less context) (show whitespace changes)
-rw-r--r-- | scripts/kconfig/prepare-all.diff | 1883 |
1 files changed, 1883 insertions, 0 deletions
diff --git a/scripts/kconfig/prepare-all.diff b/scripts/kconfig/prepare-all.diff new file mode 100644 index 0000000..305aabc --- a/dev/null +++ b/scripts/kconfig/prepare-all.diff | |||
@@ -0,0 +1,1883 @@ | |||
1 | Index: Makefile | ||
2 | =================================================================== | ||
3 | RCS file: /usr/src/cvsroot/linux-2.5/Makefile,v | ||
4 | retrieving revision 1.1.1.44 | ||
5 | diff -u -p -r1.1.1.44 Makefile | ||
6 | --- Makefile 16 Oct 2002 19:38:52 -00001.1.1.44 | ||
7 | +++ Makefile16 Oct 2002 23:00:47 -0000 | ||
8 | @@ -44,7 +44,9 @@ | ||
9 | TOPDIR:= $(CURDIR) | ||
10 | |||
11 | HOSTCC = gcc | ||
12 | +HOSTCXX = g++ | ||
13 | HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer | ||
14 | +HOSTCXXFLAGS= -O2 | ||
15 | |||
16 | CROSS_COMPILE = | ||
17 | |||
18 | @@ -161,7 +163,8 @@ | ||
19 | |||
20 | exportVERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ | ||
21 | CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ | ||
22 | -CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL | ||
23 | +CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL \ | ||
24 | +HOSTCXX HOSTCXXFLAGS | ||
25 | |||
26 | export CPPFLAGS NOSTDINC_FLAGS OBJCOPYFLAGS LDFLAGS | ||
27 | export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE | ||
28 | @@ -237,21 +240,7 @@ | ||
29 | |||
30 | #In this section, we need .config | ||
31 | |||
32 | -#If .config doesn't exist - tough luck | ||
33 | - | ||
34 | -.config: arch/$(ARCH)/config.in # FIXME $(shell find . -name Config.in) | ||
35 | -@echo '***' | ||
36 | -@if [ -f $@ ]; then \ | ||
37 | - echo '*** The tree was updated, so your .config may be'; \ | ||
38 | - echo '*** out of date!'; \ | ||
39 | -else \ | ||
40 | - echo '*** You have not yet configured your kernel!'; \ | ||
41 | -fi | ||
42 | -@echo '***' | ||
43 | -@echo '*** Please run some configurator (e.g. "make oldconfig" or' | ||
44 | -@echo '*** "make menuconfig" or "make xconfig").' | ||
45 | -@echo '***' | ||
46 | -@exit 1 | ||
47 | +-include ..config.cmd | ||
48 | |||
49 | ifdef CONFIG_MODULES | ||
50 | export EXPORT_FLAGS := -DEXPORT_SYMTAB | ||
51 | @@ -419,11 +408,8 @@ | ||
52 | # with it and forgot to run make oldconfig | ||
53 | |||
54 | include/linux/autoconf.h: .config | ||
55 | -@echo '***' | ||
56 | -@echo '*** You changed .config w/o running make *config?' | ||
57 | -@echo '*** Please run "make oldconfig"' | ||
58 | -@echo '***' | ||
59 | -@exit 1 | ||
60 | ++@$(call descend,scripts/kconfig,scripts/kconfig/conf) | ||
61 | +./scripts/kconfig/conf -s arch/$(ARCH)/Kconfig | ||
62 | |||
63 | # Generate some files | ||
64 | # --------------------------------------------------------------------------- | ||
65 | @@ -637,34 +623,36 @@ | ||
66 | .PHONY: oldconfig xconfig menuconfig config \ | ||
67 | make_with_config | ||
68 | |||
69 | -xconfig: | ||
70 | -+@$(call descend,scripts,scripts/kconfig.tk) | ||
71 | -wish -f scripts/kconfig.tk | ||
72 | +scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE | ||
73 | ++@$(call descend,scripts/kconfig,$@) | ||
74 | + | ||
75 | +xconfig: scripts/kconfig/qconf | ||
76 | +./scripts/kconfig/qconf arch/$(ARCH)/Kconfig | ||
77 | |||
78 | -menuconfig: | ||
79 | -+@$(call descend,scripts,lxdialog) | ||
80 | -$(CONFIG_SHELL) $(src)/scripts/Menuconfig arch/$(ARCH)/config.in | ||
81 | +menuconfig: scripts/kconfig/mconf | ||
82 | ++@$(call descend,scripts/lxdialog,) | ||
83 | +./scripts/kconfig/mconf arch/$(ARCH)/Kconfig | ||
84 | |||
85 | -config: | ||
86 | -$(CONFIG_SHELL) $(src)/scripts/Configure arch/$(ARCH)/config.in | ||
87 | +config: scripts/kconfig/conf | ||
88 | +./scripts/kconfig/conf arch/$(ARCH)/Kconfig | ||
89 | |||
90 | -oldconfig: | ||
91 | -$(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in | ||
92 | +oldconfig: scripts/kconfig/conf | ||
93 | +./scripts/kconfig/conf -o arch/$(ARCH)/Kconfig | ||
94 | |||
95 | -randconfig: | ||
96 | -$(CONFIG_SHELL) $(src)/scripts/Configure -r arch/$(ARCH)/config.in | ||
97 | +randconfig: scripts/kconfig/conf | ||
98 | +./scripts/kconfig/conf -r arch/$(ARCH)/Kconfig | ||
99 | |||
100 | -allyesconfig: | ||
101 | -$(CONFIG_SHELL) $(src)/scripts/Configure -y arch/$(ARCH)/config.in | ||
102 | +allyesconfig: scripts/kconfig/conf | ||
103 | +./scripts/kconfig/conf -y arch/$(ARCH)/Kconfig | ||
104 | |||
105 | -allnoconfig: | ||
106 | -$(CONFIG_SHELL) $(src)/scripts/Configure -n arch/$(ARCH)/config.in | ||
107 | +allnoconfig: scripts/kconfig/conf | ||
108 | +./scripts/kconfig/conf -n arch/$(ARCH)/Kconfig | ||
109 | |||
110 | -allmodconfig: | ||
111 | -$(CONFIG_SHELL) $(src)/scripts/Configure -m arch/$(ARCH)/config.in | ||
112 | +allmodconfig: scripts/kconfig/conf | ||
113 | +./scripts/kconfig/conf -m arch/$(ARCH)/Kconfig | ||
114 | |||
115 | -defconfig: | ||
116 | -yes '' | $(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in | ||
117 | +defconfig: scripts/kconfig/conf | ||
118 | +./scripts/kconfig/conf -d arch/$(ARCH)/Kconfig | ||
119 | |||
120 | ### | ||
121 | # Cleaning is done on three levels. | ||
122 | Index: Rules.make | ||
123 | =================================================================== | ||
124 | RCS file: /usr/src/cvsroot/linux-2.5/Rules.make,v | ||
125 | retrieving revision 1.1.1.22 | ||
126 | diff -u -p -r1.1.1.22 Rules.make | ||
127 | --- Rules.make 12 Oct 2002 11:42:02 -00001.1.1.22 | ||
128 | +++ Rules.make16 Oct 2002 23:00:49 -0000 | ||
129 | @@ -114,9 +114,33 @@ | ||
130 | # Only build module versions for files which are selected to be built | ||
131 | export-objs := $(filter $(export-objs),$(real-objs-y) $(real-objs-m)) | ||
132 | |||
133 | -host-progs-single := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m))) | ||
134 | -host-progs-multi := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m))) | ||
135 | -host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs)) | ||
136 | +# C code | ||
137 | +# Executables compiled from a single .c file | ||
138 | +host-csingle:= $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m))) | ||
139 | + | ||
140 | +# C executables linked based on several .o files | ||
141 | +host-cmulti:= $(foreach m,$(host-progs),\ | ||
142 | + $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m)))) | ||
143 | + | ||
144 | +# Object (.o) files compiled from .c files | ||
145 | +host-cobjs:= $(sort $(foreach m,$(host-progs),$($(m)-objs))) | ||
146 | + | ||
147 | +# C++ code | ||
148 | +# C++ executables compiled from at least on .cc file | ||
149 | +# and zero or more .c files | ||
150 | +host-cxxmulti:= $(foreach m,$(host-progs),$(if $($(m)-cxxobjs),$(m))) | ||
151 | + | ||
152 | +# C++ Object (.o) files compiled from .cc files | ||
153 | +host-cxxobjs:= $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) | ||
154 | + | ||
155 | +# Shared libaries (only .c supported) | ||
156 | +# Shared libraries (.so) - all .so files referenced in "xxx-objs" | ||
157 | +host-cshlib:= $(sort $(filter %.so, $(host-cobjs))) | ||
158 | +# Remove .so files from "xxx-objs" | ||
159 | +host-cobjs:= $(filter-out %.so,$(host-cobjs)) | ||
160 | + | ||
161 | +#Object (.o) files used by the shared libaries | ||
162 | +host-cshobjs:= $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs)))) | ||
163 | |||
164 | # Add subdir path | ||
165 | |||
166 | @@ -134,10 +158,14 @@ | ||
167 | subdir-ym:= $(addprefix $(obj)/,$(subdir-ym)) | ||
168 | subdir-ymn:= $(addprefix $(obj)/,$(subdir-ymn)) | ||
169 | clean-files:= $(addprefix $(obj)/,$(clean-files)) | ||
170 | -host-progs:= $(addprefix $(obj)/,$(host-progs)) | ||
171 | -host-progs-single := $(addprefix $(obj)/,$(host-progs-single)) | ||
172 | -host-progs-multi := $(addprefix $(obj)/,$(host-progs-multi)) | ||
173 | -host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs)) | ||
174 | +host-progs := $(addprefix $(obj)/,$(host-progs)) | ||
175 | +host-csingle:= $(addprefix $(obj)/,$(host-csingle)) | ||
176 | +host-cmulti:= $(addprefix $(obj)/,$(host-cmulti)) | ||
177 | +host-cobjs:= $(addprefix $(obj)/,$(host-cobjs)) | ||
178 | +host-cxxmulti:= $(addprefix $(obj)/,$(host-cxxmulti)) | ||
179 | +host-cxxobjs:= $(addprefix $(obj)/,$(host-cxxobjs)) | ||
180 | +host-cshlib:= $(addprefix $(obj)/,$(host-cshlib)) | ||
181 | +host-cshobjs:= $(addprefix $(obj)/,$(host-cshobjs)) | ||
182 | |||
183 | # The temporary file to save gcc -MD generated dependencies must not | ||
184 | # contain a comma | ||
185 | @@ -423,30 +451,96 @@ | ||
186 | |||
187 | # Compile programs on the host | ||
188 | # =========================================================================== | ||
189 | +# host-progs := bin2hex | ||
190 | +# Will compile bin2hex.c and create an executable named bin2hex | ||
191 | +# | ||
192 | +# host-progs := lxdialog | ||
193 | +# lxdialog-objs := checklist.o lxdialog.o | ||
194 | +# Will compile lxdialog.c and checklist.c, and then link the executable | ||
195 | +# lxdialog, based on checklist.o and lxdialog.o | ||
196 | +# | ||
197 | +# host-progs := qconf | ||
198 | +# qconf-cxxobjs := qconf.o | ||
199 | +# qconf-objs := menu.o | ||
200 | +# Will compile qconf as a C++ program, and menu as a C program. | ||
201 | +# They are linked as C++ code to the executable qconf | ||
202 | + | ||
203 | +# host-progs := conf | ||
204 | +# conf-objs := conf.o libkconfig.so | ||
205 | +# libkconfig-objs := expr.o type.o | ||
206 | +# Will create a shared library named libkconfig.so that consist of | ||
207 | +# expr.o and type.o (they are both compiled as C code and the object file | ||
208 | +# are made as position independent code). | ||
209 | +# conf.c is compiled as a c program, and conf.o is linked together with | ||
210 | +# libkconfig.so as the executable conf. | ||
211 | +# Note: Shared libraries consisting of C++ files are not supported | ||
212 | +# | ||
213 | + | ||
214 | +# Create executable from a single .c file | ||
215 | +# host-csingle -> Executable | ||
216 | +quiet_cmd_host-csingle = HOSTCC $(echo_target) | ||
217 | + cmd_host-csingle= $(HOSTCC) -Wp,-MD,$(depfile) \ | ||
218 | + $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ | ||
219 | + $(HOST_LOADLIBES) -o $@ $< | ||
220 | +$(host-csingle): %: %.c FORCE | ||
221 | +$(call if_changed_dep,host-csingle) | ||
222 | + | ||
223 | +# Link an executable based on list of .o files, all plain c | ||
224 | +# host-cmulti -> executable | ||
225 | +quiet_cmd_host-cmulti= HOSTLD $(echo_target) | ||
226 | + cmd_host-cmulti= $(HOSTCC) $(HOSTLDFLAGS) -o $@ \ | ||
227 | + $(addprefix $(obj)/,$($(@F)-objs)) \ | ||
228 | + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | ||
229 | +$(host-cmulti): %: $(host-cobjs) $(host-cshlib) FORCE | ||
230 | +$(call if_changed,host-cmulti) | ||
231 | + | ||
232 | +# Create .o file from a single .c file | ||
233 | +# host-cobjs -> .o | ||
234 | +quiet_cmd_host-cobjs= HOSTCC $(echo_target) | ||
235 | + cmd_host-cobjs= $(HOSTCC) -Wp,-MD,$(depfile) \ | ||
236 | + $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ | ||
237 | + $(HOSTCFLAGS_$(@F)) -c -o $@ $< | ||
238 | +$(host-cobjs): %.o: %.c FORCE | ||
239 | +$(call if_changed_dep,host-cobjs) | ||
240 | + | ||
241 | +# Link an executable based on list of .o files, a mixture of .c and .cc | ||
242 | +# host-cxxmulti -> executable | ||
243 | +quiet_cmd_host-cxxmulti= HOSTLD $(echo_target) | ||
244 | + cmd_host-cxxmulti= $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \ | ||
245 | + $(foreach o,objs cxxobjs,\ | ||
246 | + $(addprefix $(obj)/,$($(@F)-$(o)))) \ | ||
247 | + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | ||
248 | +$(host-cxxmulti): %: $(host-cobjs) $(host-cxxobjs) $(host-cshlib) FORCE | ||
249 | +$(call if_changed,host-cxxmulti) | ||
250 | + | ||
251 | +# Create .o file from a single .cc (C++) file | ||
252 | +quiet_cmd_host-cxxobjs= HOSTCXX $(echo_target) | ||
253 | + cmd_host-cxxobjs= $(HOSTCXX) -Wp,-MD,$(depfile) \ | ||
254 | + $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ | ||
255 | + $(HOSTCXXFLAGS_$(@F)) -c -o $@ $< | ||
256 | +$(host-cxxobjs): %.o: %.cc FORCE | ||
257 | +$(call if_changed_dep,host-cxxobjs) | ||
258 | + | ||
259 | +# Compile .c file, create position independent .o file | ||
260 | +# host-cshobjs -> .o | ||
261 | +quiet_cmd_host-cshobjs= HOSTCC -fPIC $(echo_target) | ||
262 | + cmd_host-cshobjs= $(HOSTCC) -Wp,-MD,$(depfile) -fPIC\ | ||
263 | + $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ | ||
264 | + $(HOSTCFLAGS_$(@F)) -c -o $@ $< | ||
265 | +$(host-cshobjs): %.o: %.c FORCE | ||
266 | +$(call if_changed_dep,host-cshobjs) | ||
267 | + | ||
268 | +# Link a shared library, based on position independent .o files | ||
269 | +# *.o -> .so shared library (host-cshlib) | ||
270 | +quiet_cmd_host-cshlib= HOSTLLD -shared $(echo_target) | ||
271 | + cmd_host-cshlib= $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \ | ||
272 | + $(addprefix $(obj)/,$($(@F:.so=-objs))) \ | ||
273 | + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | ||
274 | +$(host-cshlib): %: $(host-cshobjs) FORCE | ||
275 | +$(call if_changed,host-cshlib) | ||
276 | |||
277 | -quiet_cmd_host_cc__c = HOSTCC $(echo_target) | ||
278 | -cmd_host_cc__c = $(HOSTCC) -Wp,-MD,$(depfile) \ | ||
279 | - $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ | ||
280 | - $(HOST_LOADLIBES) -o $@ $< | ||
281 | - | ||
282 | -$(host-progs-single): %: %.c FORCE | ||
283 | -$(call if_changed_dep,host_cc__c) | ||
284 | - | ||
285 | -quiet_cmd_host_cc_o_c = HOSTCC $(echo_target) | ||
286 | -cmd_host_cc_o_c = $(HOSTCC) -Wp,-MD,$(depfile) \ | ||
287 | - $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< | ||
288 | - | ||
289 | -$(host-progs-multi-objs): %.o: %.c FORCE | ||
290 | -$(call if_changed_dep,host_cc_o_c) | ||
291 | - | ||
292 | -quiet_cmd_host_cc__o = HOSTLD $(echo_target) | ||
293 | -cmd_host_cc__o = $(HOSTCC) $(HOSTLDFLAGS) -o $@ $(addprefix $(obj)/,$($(subst $(obj)/,,$@)-objs)) \ | ||
294 | - $(HOST_LOADLIBES) | ||
295 | - | ||
296 | -$(host-progs-multi): %: $(host-progs-multi-objs) FORCE | ||
297 | -$(call if_changed,host_cc__o) | ||
298 | - | ||
299 | -targets += $(host-progs-single) $(host-progs-multi-objs) $(host-progs-multi) | ||
300 | +targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ | ||
301 | + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) | ||
302 | |||
303 | endif # ! subdirclean | ||
304 | endif # ! modules_install | ||
305 | Index: arch/alpha/config.in | ||
306 | =================================================================== | ||
307 | RCS file: /usr/src/cvsroot/linux-2.5/arch/alpha/config.in,v | ||
308 | retrieving revision 1.1.1.16 | ||
309 | diff -u -p -r1.1.1.16 config.in | ||
310 | --- arch/alpha/config.in 12 Oct 2002 11:50:40 -00001.1.1.16 | ||
311 | +++ arch/alpha/config.in16 Oct 2002 23:00:53 -0000 | ||
312 | @@ -19,11 +19,11 @@ choice 'Alpha system type' \ | ||
313 | Alcor/Alpha-XLT CONFIG_ALPHA_ALCOR \ | ||
314 | Alpha-XL CONFIG_ALPHA_XL \ | ||
315 | AlphaBook1 CONFIG_ALPHA_BOOK1 \ | ||
316 | - Avanti CONFIG_ALPHA_AVANTI \ | ||
317 | + Avanti CONFIG_ALPHA_AVANTI_CH \ | ||
318 | Cabriolet CONFIG_ALPHA_CABRIOLET \ | ||
319 | DP264 CONFIG_ALPHA_DP264 \ | ||
320 | EB164 CONFIG_ALPHA_EB164 \ | ||
321 | - EB64+ CONFIG_ALPHA_EB64P \ | ||
322 | + EB64+ CONFIG_ALPHA_EB64P_CH \ | ||
323 | EB66 CONFIG_ALPHA_EB66 \ | ||
324 | EB66+ CONFIG_ALPHA_EB66P \ | ||
325 | Eiger CONFIG_ALPHA_EIGER \ | ||
326 | @@ -32,7 +32,7 @@ choice 'Alpha system type' \ | ||
327 | Miata CONFIG_ALPHA_MIATA \ | ||
328 | Mikasa CONFIG_ALPHA_MIKASA \ | ||
329 | Nautilus CONFIG_ALPHA_NAUTILUS \ | ||
330 | - Noname CONFIG_ALPHA_NONAME \ | ||
331 | + Noname CONFIG_ALPHA_NONAME_CH \ | ||
332 | Noritake CONFIG_ALPHA_NORITAKE \ | ||
333 | PC164 CONFIG_ALPHA_PC164 \ | ||
334 | Platform2000 CONFIG_ALPHA_P2K \ | ||
335 | @@ -69,7 +69,7 @@ else | ||
336 | define_bool CONFIG_PCI y | ||
337 | fi | ||
338 | |||
339 | -if [ "$CONFIG_ALPHA_BOOK1" = "y" ] | ||
340 | +if [ "$CONFIG_ALPHA_BOOK1" = "y" -o "$CONFIG_ALPHA_NONAME_CH" = "y" ] | ||
341 | then | ||
342 | define_bool CONFIG_ALPHA_NONAME y | ||
343 | fi | ||
344 | @@ -79,13 +79,13 @@ then | ||
345 | define_bool CONFIG_ALPHA_EV4 y | ||
346 | define_bool CONFIG_ALPHA_LCA y | ||
347 | fi | ||
348 | -if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI" = "y" \ | ||
349 | --o "$CONFIG_ALPHA_EB64P" = "y" -o "$CONFIG_ALPHA_XL" = "y" ] | ||
350 | +if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI_CH" = "y" \ | ||
351 | +-o "$CONFIG_ALPHA_EB64P_CH" = "y" -o "$CONFIG_ALPHA_XL" = "y" ] | ||
352 | then | ||
353 | define_bool CONFIG_ALPHA_EV4 y | ||
354 | define_bool CONFIG_ALPHA_APECS y | ||
355 | fi | ||
356 | -if [ "$CONFIG_ALPHA_CABRIOLET" = "y" ] | ||
357 | +if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_EB64P_CH" = "y" ] | ||
358 | then | ||
359 | define_bool CONFIG_ALPHA_EB64P y | ||
360 | fi | ||
361 | @@ -198,7 +198,7 @@ if [ "$CONFIG_ALPHA_JENSEN" = "y" -o "$C | ||
362 | then | ||
363 | define_bool CONFIG_ALPHA_SRM y | ||
364 | fi | ||
365 | -if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI" = "y" \ | ||
366 | +if [ "$CONFIG_ALPHA_CABRIOLET" = "y" -o "$CONFIG_ALPHA_AVANTI_CH" = "y" \ | ||
367 | -o "$CONFIG_ALPHA_EB64P" = "y" -o "$CONFIG_ALPHA_PC164" = "y" \ | ||
368 | -o "$CONFIG_ALPHA_TAKARA" = "y" -o "$CONFIG_ALPHA_EB164" = "y" \ | ||
369 | -o "$CONFIG_ALPHA_ALCOR" = "y" -o "$CONFIG_ALPHA_MIATA" = "y" \ | ||
370 | @@ -214,7 +214,7 @@ if [ "$CONFIG_ALPHA_ALCOR" = "y" -o "$CO | ||
371 | then | ||
372 | define_bool CONFIG_ALPHA_EISA y | ||
373 | fi | ||
374 | -if [ "$CONFIG_ALPHA_XL" = "y" ] | ||
375 | +if [ "$CONFIG_ALPHA_XL" = "y" -o "$CONFIG_ALPHA_AVANTI_CH" = "y" ] | ||
376 | then | ||
377 | define_bool CONFIG_ALPHA_AVANTI y | ||
378 | fi | ||
379 | @@ -253,7 +253,7 @@ bool 'Support for hot-pluggable devices' | ||
380 | if [ "$CONFIG_HOTPLUG" = "y" ] ; then | ||
381 | source drivers/pcmcia/Config.in | ||
382 | else | ||
383 | - define_bool CONFIG_PCMCIA n | ||
384 | + define_tristate CONFIG_PCMCIA n | ||
385 | fi | ||
386 | |||
387 | if [ "$CONFIG_PROC_FS" = "y" ]; then | ||
388 | @@ -306,9 +306,9 @@ if [ "$CONFIG_SCSI" != "n" ]; then | ||
389 | fi | ||
390 | endmenu | ||
391 | |||
392 | -if [ "$CONFIG_PCI" = "y" ]; then | ||
393 | +#if [ "$CONFIG_PCI" = "y" ]; then | ||
394 | source drivers/message/fusion/Config.in | ||
395 | -fi | ||
396 | +#fi | ||
397 | |||
398 | if [ "$CONFIG_NET" = "y" ]; then | ||
399 | source net/Config.in | ||
400 | @@ -399,3 +399,4 @@ endmenu | ||
401 | |||
402 | source security/Config.in | ||
403 | source lib/Config.in | ||
404 | +source config.undef | ||
405 | Index: arch/arm/config.in | ||
406 | =================================================================== | ||
407 | RCS file: /usr/src/cvsroot/linux-2.5/arch/arm/config.in,v | ||
408 | retrieving revision 1.1.1.17 | ||
409 | diff -u -p -r1.1.1.17 config.in | ||
410 | --- arch/arm/config.in 16 Oct 2002 19:45:13 -00001.1.1.17 | ||
411 | +++ arch/arm/config.in16 Oct 2002 23:00:54 -0000 | ||
412 | @@ -356,7 +356,7 @@ bool 'Support for hot-pluggable devices' | ||
413 | if [ "$CONFIG_HOTPLUG" = "y" ]; then | ||
414 | source drivers/pcmcia/Config.in | ||
415 | else | ||
416 | - define_bool CONFIG_PCMCIA n | ||
417 | + define_tristate CONFIG_PCMCIA n | ||
418 | fi | ||
419 | comment 'At least one math emulation must be selected' | ||
420 | tristate 'NWFPE math emulation' CONFIG_FPE_NWFPE | ||
421 | @@ -416,10 +416,11 @@ endmenu | ||
422 | |||
423 | source drivers/parport/Config.in | ||
424 | |||
425 | -if [ "$CONFIG_ALIGNMENT_TRAP" = "y" ]; then | ||
426 | +#if [ "$CONFIG_ALIGNMENT_TRAP" = "y" ]; then | ||
427 | source drivers/mtd/Config.in | ||
428 | -else | ||
429 | - define_bool CONFIG_MTD n | ||
430 | +#else | ||
431 | +if [ "$CONFIG_ALIGNMENT_TRAP" != "y" ]; then | ||
432 | + define_tristate CONFIG_MTD n | ||
433 | fi | ||
434 | |||
435 | source drivers/pnp/Config.in | ||
436 | @@ -442,10 +443,11 @@ if [ "$CONFIG_NET" = "y" ]; then | ||
437 | fi | ||
438 | endmenu | ||
439 | |||
440 | - source net/ax25/Config.in | ||
441 | +# source net/ax25/Config.in | ||
442 | |||
443 | source net/irda/Config.in | ||
444 | fi | ||
445 | + source net/ax25/Config.in | ||
446 | |||
447 | mainmenu_option next_comment | ||
448 | comment 'ATA/ATAPI/MFM/RLL support' | ||
449 | @@ -469,9 +471,9 @@ if [ "$CONFIG_SCSI" != "n" ]; then | ||
450 | fi | ||
451 | endmenu | ||
452 | |||
453 | -if [ "$CONFIG_ARCH_CLPS711X" = "y" ]; then | ||
454 | - source drivers/ssi/Config.in | ||
455 | -fi | ||
456 | +#if [ "$CONFIG_ARCH_CLPS711X" = "y" ]; then | ||
457 | +# source drivers/ssi/Config.in | ||
458 | +#fi | ||
459 | |||
460 | source drivers/ieee1394/Config.in | ||
461 | |||
462 | @@ -554,3 +556,4 @@ endmenu | ||
463 | |||
464 | source security/Config.in | ||
465 | source lib/Config.in | ||
466 | +source config.undef | ||
467 | Index: arch/cris/config.in | ||
468 | =================================================================== | ||
469 | RCS file: /usr/src/cvsroot/linux-2.5/arch/cris/config.in,v | ||
470 | retrieving revision 1.1.1.8 | ||
471 | diff -u -p -r1.1.1.8 config.in | ||
472 | --- arch/cris/config.in 27 Aug 2002 23:44:08 -00001.1.1.8 | ||
473 | +++ arch/cris/config.in16 Oct 2002 23:00:57 -0000 | ||
474 | @@ -230,3 +230,4 @@ endmenu | ||
475 | |||
476 | source security/Config.in | ||
477 | source lib/Config.in | ||
478 | +source config.undef | ||
479 | Index: arch/cris/drivers/Config.in | ||
480 | =================================================================== | ||
481 | RCS file: /usr/src/cvsroot/linux-2.5/arch/cris/drivers/Config.in,v | ||
482 | retrieving revision 1.1.1.3 | ||
483 | diff -u -p -r1.1.1.3 Config.in | ||
484 | --- arch/cris/drivers/Config.in 25 May 2002 16:26:27 -00001.1.1.3 | ||
485 | +++ arch/cris/drivers/Config.in16 Oct 2002 23:00:57 -0000 | ||
486 | @@ -111,11 +111,11 @@ if [ "$CONFIG_ETRAX_IDE" = "y" ]; then | ||
487 | # general ide drivers so the common case does not need to go | ||
488 | # into that config submenu. enable disk and CD support. others | ||
489 | # need to go fiddle in the submenu.. | ||
490 | -define_bool CONFIG_IDE y | ||
491 | +define_tristate CONFIG_IDE y | ||
492 | |||
493 | -define_bool CONFIG_BLK_DEV_IDE y | ||
494 | -define_bool CONFIG_BLK_DEV_IDEDISK y | ||
495 | -define_bool CONFIG_BLK_DEV_IDECD y | ||
496 | +define_tristate CONFIG_BLK_DEV_IDE y | ||
497 | +define_tristate CONFIG_BLK_DEV_IDEDISK y | ||
498 | +define_tristate CONFIG_BLK_DEV_IDECD y | ||
499 | |||
500 | define_bool CONFIG_BLK_DEV_IDEDMA y | ||
501 | |||
502 | @@ -127,7 +127,7 @@ if [ "$CONFIG_ETRAX_IDE" = "y" ]; then | ||
503 | Port_CSE1_Bit_16 CONFIG_ETRAX_IDE_CSE1_16_RESET\ | ||
504 | Port_CSP0_Bit_08 CONFIG_ETRAX_IDE_CSP0_8_RESET" Port_PB_Bit_7 | ||
505 | else | ||
506 | -define_bool CONFIG_IDE n | ||
507 | +define_tristate CONFIG_IDE n | ||
508 | fi | ||
509 | |||
510 | bool 'Axis flash-map support' CONFIG_ETRAX_AXISFLASHMAP | ||
511 | @@ -136,17 +136,17 @@ if [ "$CONFIG_ETRAX_AXISFLASHMAP" = "y" | ||
512 | int ' Byte-offset of partition table sector' CONFIG_ETRAX_PTABLE_SECTOR 65536 | ||
513 | # here we define the CONFIG_'s necessary to enable MTD support | ||
514 | # for the flash | ||
515 | -define_bool CONFIG_MTD y | ||
516 | +define_tristate CONFIG_MTD y | ||
517 | |||
518 | -define_bool CONFIG_MTD_CFI y | ||
519 | -define_bool CONFIG_MTD_CFI_INTELEXT n | ||
520 | -define_bool CONFIG_MTD_CFI_AMDSTD y | ||
521 | +define_tristate CONFIG_MTD_CFI y | ||
522 | +define_tristate CONFIG_MTD_CFI_INTELEXT n | ||
523 | +define_tristate CONFIG_MTD_CFI_AMDSTD y | ||
524 | |||
525 | -define_bool CONFIG_MTD_AMDSTD y | ||
526 | +define_tristate CONFIG_MTD_AMDSTD y | ||
527 | |||
528 | -define_bool CONFIG_MTD_CHAR y | ||
529 | -define_bool CONFIG_MTD_BLOCK y | ||
530 | -define_bool CONFIG_MTD_PARTITIONS y | ||
531 | +define_tristate CONFIG_MTD_CHAR y | ||
532 | +define_tristate CONFIG_MTD_BLOCK y | ||
533 | +define_tristate CONFIG_MTD_PARTITIONS y | ||
534 | fi | ||
535 | |||
536 | bool 'I2C support' CONFIG_ETRAX_I2C | ||
537 | @@ -182,11 +182,11 @@ fi | ||
538 | |||
539 | bool 'USB host' CONFIG_ETRAX_USB_HOST | ||
540 | if [ "$CONFIG_ETRAX_USB_HOST" = "y" ]; then | ||
541 | -define_bool CONFIG_USB y | ||
542 | +define_tristate CONFIG_USB y | ||
543 | bool ' USB port 1 enabled' CONFIG_ETRAX_USB_HOST_PORT1 | ||
544 | bool ' USB port 2 enabled' CONFIG_ETRAX_USB_HOST_PORT2 | ||
545 | else | ||
546 | -define_bool CONFIG_USB n | ||
547 | +define_tristate CONFIG_USB n | ||
548 | fi | ||
549 | |||
550 | bool 'DS1302 Real Time Clock support' CONFIG_ETRAX_DS1302 | ||
551 | Index: arch/i386/config.in | ||
552 | =================================================================== | ||
553 | RCS file: /usr/src/cvsroot/linux-2.5/arch/i386/config.in,v | ||
554 | retrieving revision 1.1.1.28 | ||
555 | diff -u -p -r1.1.1.28 config.in | ||
556 | --- arch/i386/config.in 16 Oct 2002 19:44:19 -00001.1.1.28 | ||
557 | +++ arch/i386/config.in16 Oct 2002 23:00:59 -0000 | ||
558 | @@ -185,6 +185,7 @@ else | ||
559 | fi | ||
560 | fi | ||
561 | fi | ||
562 | + define_bool CONFIG_X86_UP_APIC y | ||
563 | fi | ||
564 | |||
565 | bool 'Machine Check Exception' CONFIG_X86_MCE | ||
566 | @@ -313,8 +314,8 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then | ||
567 | source drivers/pcmcia/Config.in | ||
568 | source drivers/hotplug/Config.in | ||
569 | else | ||
570 | - define_bool CONFIG_PCMCIA n | ||
571 | - define_bool CONFIG_HOTPLUG_PCI n | ||
572 | + define_tristate CONFIG_PCMCIA n | ||
573 | + define_tristate CONFIG_HOTPLUG_PCI n | ||
574 | fi | ||
575 | |||
576 | endmenu | ||
577 | @@ -423,10 +424,10 @@ if [ "$CONFIG_VT" = "y" ]; then | ||
578 | comment 'Console drivers' | ||
579 | bool 'VGA text console' CONFIG_VGA_CONSOLE | ||
580 | bool 'Video mode selection support' CONFIG_VIDEO_SELECT | ||
581 | - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
582 | + #if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
583 | tristate 'MDA text console (dual-headed) (EXPERIMENTAL)' CONFIG_MDA_CONSOLE | ||
584 | source drivers/video/Config.in | ||
585 | - fi | ||
586 | + #fi | ||
587 | endmenu | ||
588 | fi | ||
589 | |||
590 | @@ -480,3 +481,4 @@ if [ "$CONFIG_SMP" = "y" ]; then | ||
591 | fi | ||
592 | |||
593 | define_bool CONFIG_X86_BIOS_REBOOT y | ||
594 | +source config.undef | ||
595 | Index: arch/ia64/config.in | ||
596 | =================================================================== | ||
597 | RCS file: /usr/src/cvsroot/linux-2.5/arch/ia64/config.in,v | ||
598 | retrieving revision 1.1.1.16 | ||
599 | diff -u -p -r1.1.1.16 config.in | ||
600 | --- arch/ia64/config.in 12 Oct 2002 11:52:18 -00001.1.1.16 | ||
601 | +++ arch/ia64/config.in16 Oct 2002 23:01:01 -0000 | ||
602 | @@ -28,17 +28,27 @@ choice 'IA-64 system type' \ | ||
603 | |||
604 | if [ "$CONFIG_ITANIUM" = "y" ]; then | ||
605 | choice 'Kernel page size' \ | ||
606 | - "4KB CONFIG_IA64_PAGE_SIZE_4KB \ | ||
607 | - 8KB CONFIG_IA64_PAGE_SIZE_8KB \ | ||
608 | - 16KB CONFIG_IA64_PAGE_SIZE_16KB" 16KB | ||
609 | + "4KB CONFIG_IA64_PAGE_SIZE_4KB_1 \ | ||
610 | + 8KB CONFIG_IA64_PAGE_SIZE_8KB_1 \ | ||
611 | + 16KB CONFIG_IA64_PAGE_SIZE_16KB_1" 16KB | ||
612 | else | ||
613 | choice 'Kernel page size' \ | ||
614 | - "4KB CONFIG_IA64_PAGE_SIZE_4KB \ | ||
615 | - 8KB CONFIG_IA64_PAGE_SIZE_8KB \ | ||
616 | - 16KB CONFIG_IA64_PAGE_SIZE_16KB \ | ||
617 | + "4KB CONFIG_IA64_PAGE_SIZE_4KB_2 \ | ||
618 | + 8KB CONFIG_IA64_PAGE_SIZE_8KB_2 \ | ||
619 | + 16KB CONFIG_IA64_PAGE_SIZE_16KB_2 \ | ||
620 | 64KB CONFIG_IA64_PAGE_SIZE_64KB" 16KB | ||
621 | fi | ||
622 | |||
623 | +if [ "$CONFIG_IA64_PAGE_SIZE_4KB_1" = "y" -o "$CONFIG_IA64_PAGE_SIZE_4KB_2" = "y" ]; then | ||
624 | + define_bool CONFIG_IA64_PAGE_SIZE_4KB y | ||
625 | +fi | ||
626 | +if [ "$CONFIG_IA64_PAGE_SIZE_8KB_1" = "y" -o "$CONFIG_IA64_PAGE_SIZE_8KB_2" = "y" ]; then | ||
627 | + define_bool CONFIG_IA64_PAGE_SIZE_8KB y | ||
628 | +fi | ||
629 | +if [ "$CONFIG_IA64_PAGE_SIZE_16KB_1" = "y" -o "$CONFIG_IA64_PAGE_SIZE_16KB_2" = "y" ]; then | ||
630 | + define_bool CONFIG_IA64_PAGE_SIZE_16KB y | ||
631 | +fi | ||
632 | + | ||
633 | if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
634 | define_bool CONFIG_ACPI y | ||
635 | define_bool CONFIG_ACPI_EFI y | ||
636 | @@ -64,7 +74,7 @@ if [ "$CONFIG_MCKINLEY" = "y" ]; then | ||
637 | fi | ||
638 | fi | ||
639 | |||
640 | -if [ "$CONFIG_IA64_GENERIC" = "y" -o "$CONFIG_IA64_DIG" = "y" -o "$CONFIG_IA64_HP_ZX1" = "y" ]; | ||
641 | +if [ "$CONFIG_IA64_GENERIC" = "y" -o "$CONFIG_IA64_DIG" = "y" -o "$CONFIG_IA64_HP_ZX1" = "y" ] | ||
642 | then | ||
643 | bool ' Enable IA-64 Machine Check Abort' CONFIG_IA64_MCA | ||
644 | define_bool CONFIG_PM y | ||
645 | @@ -95,23 +105,42 @@ if [ "$CONFIG_HUGETLB_PAGE" = "y" ]; the | ||
646 | if [ "$CONFIG_MCKINLEY" = "y" ]; then | ||
647 | choice ' IA-64 Huge TLB Page Size' \ | ||
648 | "4GB CONFIG_HUGETLB_PAGE_SIZE_4GB \ | ||
649 | - 256MB CONFIG_HUGETLB_PAGE_SIZE_256MB \ | ||
650 | - 64MB CONFIG_HUGETLB_PAGE_SIZE_64MB \ | ||
651 | - 16MB CONFIG_HUGETLB_PAGE_SIZE_16MB \ | ||
652 | - 4MB CONFIG_HUGETLB_PAGE_SIZE_4MB \ | ||
653 | - 1MB CONFIG_HUGETLB_PAGE_SIZE_1MB \ | ||
654 | - 256KB CONFIG_HUGETLB_PAGE_SIZE_256KB" 16MB | ||
655 | + 256MB CONFIG_HUGETLB_PAGE_SIZE_256MB_1 \ | ||
656 | + 64MB CONFIG_HUGETLB_PAGE_SIZE_64MB_1 \ | ||
657 | + 16MB CONFIG_HUGETLB_PAGE_SIZE_16MB_1 \ | ||
658 | + 4MB CONFIG_HUGETLB_PAGE_SIZE_4MB_1 \ | ||
659 | + 1MB CONFIG_HUGETLB_PAGE_SIZE_1MB_1 \ | ||
660 | + 256KB CONFIG_HUGETLB_PAGE_SIZE_256KB_1" 16MB | ||
661 | else | ||
662 | choice ' IA-64 Huge TLB Page Size' \ | ||
663 | - "256MB CONFIG_HUGETLB_PAGE_SIZE_256MB \ | ||
664 | - 64MB CONFIG_HUGETLB_PAGE_SIZE_64MB \ | ||
665 | - 16MB CONFIG_HUGETLB_PAGE_SIZE_16MB \ | ||
666 | - 4MB CONFIG_HUGETLB_PAGE_SIZE_4MB \ | ||
667 | - 1MB CONFIG_HUGETLB_PAGE_SIZE_1MB \ | ||
668 | - 256KB CONFIG_HUGETLB_PAGE_SIZE_256KB" 16MB | ||
669 | + "256MB CONFIG_HUGETLB_PAGE_SIZE_256MB_2 \ | ||
670 | + 64MB CONFIG_HUGETLB_PAGE_SIZE_64MB_2 \ | ||
671 | + 16MB CONFIG_HUGETLB_PAGE_SIZE_16MB_2 \ | ||
672 | + 4MB CONFIG_HUGETLB_PAGE_SIZE_4MB_2 \ | ||
673 | + 1MB CONFIG_HUGETLB_PAGE_SIZE_1MB_2 \ | ||
674 | + 256KB CONFIG_HUGETLB_PAGE_SIZE_256KB_2" 16MB | ||
675 | fi | ||
676 | fi | ||
677 | |||
678 | +if [ "$CONFIG_HUGETLB_PAGE_SIZE_256MB_1" = "y" -o "$CONFIG_HUGETLB_PAGE_SIZE_256MB_2" = "y" ]; then | ||
679 | + define_bool CONFIG_HUGETLB_PAGE_SIZE_256MB y | ||
680 | +fi | ||
681 | +if [ "$CONFIG_HUGETLB_PAGE_SIZE_64MB_1" = "y" -o "$CONFIG_HUGETLB_PAGE_SIZE_64MB_2" = "y" ]; then | ||
682 | + define_bool CONFIG_HUGETLB_PAGE_SIZE_64MB y | ||
683 | +fi | ||
684 | +if [ "$CONFIG_HUGETLB_PAGE_SIZE_16MB_1" = "y" -o "$CONFIG_HUGETLB_PAGE_SIZE_16MB_2" = "y" ]; then | ||
685 | + define_bool CONFIG_HUGETLB_PAGE_SIZE_16MB y | ||
686 | +fi | ||
687 | +if [ "$CONFIG_HUGETLB_PAGE_SIZE_4MB_1" = "y" -o "$CONFIG_HUGETLB_PAGE_SIZE_4MB_2" = "y" ]; then | ||
688 | + define_bool CONFIG_HUGETLB_PAGE_SIZE_4MB y | ||
689 | +fi | ||
690 | +if [ "$CONFIG_HUGETLB_PAGE_SIZE_1MB_1" = "y" -o "$CONFIG_HUGETLB_PAGE_SIZE_1MB_2" = "y" ]; then | ||
691 | + define_bool CONFIG_HUGETLB_PAGE_SIZE_1MB y | ||
692 | +fi | ||
693 | +if [ "$CONFIG_HUGETLB_PAGE_SIZE_256KB_1" = "y" -o "$CONFIG_HUGETLB_PAGE_SIZE_256KB_2" = "y" ]; then | ||
694 | + define_bool CONFIG_HUGETLB_PAGE_SIZE_256KB y | ||
695 | +fi | ||
696 | + | ||
697 | bool 'SMP support' CONFIG_SMP | ||
698 | bool 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT | ||
699 | bool 'Performance monitor support' CONFIG_PERFMON | ||
700 | @@ -125,7 +154,7 @@ fi | ||
701 | tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF | ||
702 | tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC | ||
703 | |||
704 | -if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
705 | +#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
706 | source drivers/acpi/Config.in | ||
707 | |||
708 | bool 'PCI support' CONFIG_PCI | ||
709 | @@ -136,15 +165,15 @@ if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
710 | source drivers/hotplug/Config.in | ||
711 | source drivers/pcmcia/Config.in | ||
712 | else | ||
713 | - define_bool CONFIG_PCMCIA n | ||
714 | + define_tristate CONFIG_PCMCIA n | ||
715 | fi | ||
716 | |||
717 | source drivers/parport/Config.in | ||
718 | -fi # !HP_SIM | ||
719 | +#fi # !HP_SIM | ||
720 | |||
721 | endmenu | ||
722 | |||
723 | -if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
724 | +#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
725 | source drivers/mtd/Config.in | ||
726 | source drivers/pnp/Config.in | ||
727 | source drivers/block/Config.in | ||
728 | @@ -164,7 +193,7 @@ if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
729 | define_bool CONFIG_BLK_DEV_HD n | ||
730 | fi | ||
731 | endmenu | ||
732 | -fi | ||
733 | +#fi | ||
734 | |||
735 | mainmenu_option next_comment | ||
736 | comment 'SCSI support' | ||
737 | @@ -180,7 +209,7 @@ if [ "$CONFIG_NET" = "y" ]; then | ||
738 | source net/Config.in | ||
739 | fi | ||
740 | |||
741 | -if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
742 | +#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
743 | if [ "$CONFIG_NET" = "y" ]; then | ||
744 | mainmenu_option next_comment | ||
745 | comment 'Network device support' | ||
746 | @@ -212,7 +241,8 @@ if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
747 | #source drivers/misc/Config.in | ||
748 | |||
749 | source drivers/media/Config.in | ||
750 | -else # HP_SIM | ||
751 | +#else # HP_SIM | ||
752 | +if [ "$CONFIG_IA64_HP_SIM" != "n" ]; then | ||
753 | |||
754 | mainmenu_option next_comment | ||
755 | comment 'Block devices' | ||
756 | @@ -228,7 +258,7 @@ fi # HP_SIM | ||
757 | |||
758 | source fs/Config.in | ||
759 | |||
760 | -if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
761 | +#if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
762 | if [ "$CONFIG_VT" = "y" ]; then | ||
763 | mainmenu_option next_comment | ||
764 | comment 'Console drivers' | ||
765 | @@ -252,7 +282,7 @@ if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then | ||
766 | source drivers/usb/Config.in | ||
767 | source lib/Config.in | ||
768 | source net/bluetooth/Config.in | ||
769 | -fi # !HP_SIM | ||
770 | +#fi # !HP_SIM | ||
771 | |||
772 | if [ "$CONFIG_IA64_HP_SIM" != "n" -o "$CONFIG_IA64_GENERIC" != "n" ]; then | ||
773 | source arch/ia64/hp/sim/Config.in | ||
774 | @@ -288,3 +318,4 @@ fi | ||
775 | endmenu | ||
776 | |||
777 | source security/Config.in | ||
778 | +source config.undef | ||
779 | Index: arch/m68k/config.in | ||
780 | =================================================================== | ||
781 | RCS file: /usr/src/cvsroot/linux-2.5/arch/m68k/config.in,v | ||
782 | retrieving revision 1.1.1.13 | ||
783 | diff -u -p -r1.1.1.13 config.in | ||
784 | --- arch/m68k/config.in 12 Oct 2002 11:51:33 -00001.1.1.13 | ||
785 | +++ arch/m68k/config.in16 Oct 2002 23:01:03 -0000 | ||
786 | @@ -18,7 +18,7 @@ comment 'Platform dependent setup' | ||
787 | |||
788 | define_bool CONFIG_EISA n | ||
789 | define_bool CONFIG_MCA n | ||
790 | -define_bool CONFIG_PCMCIA n | ||
791 | +define_tristate CONFIG_PCMCIA n | ||
792 | |||
793 | bool 'Amiga support' CONFIG_AMIGA | ||
794 | bool 'Atari support' CONFIG_ATARI | ||
795 | @@ -141,9 +141,9 @@ fi | ||
796 | source drivers/pci/Config.in | ||
797 | source drivers/zorro/Config.in | ||
798 | |||
799 | -if [ "$CONFIG_Q40" = "y" ]; then | ||
800 | +#if [ "$CONFIG_Q40" = "y" ]; then | ||
801 | source drivers/pnp/Config.in | ||
802 | -fi | ||
803 | +#fi | ||
804 | |||
805 | endmenu | ||
806 | |||
807 | @@ -153,9 +153,9 @@ source drivers/block/Config.in | ||
808 | |||
809 | source drivers/md/Config.in | ||
810 | |||
811 | -if [ "$CONFIG_MAC" = "y" ]; then | ||
812 | +#if [ "$CONFIG_MAC" = "y" ]; then | ||
813 | source drivers/input/Config.in | ||
814 | -fi | ||
815 | +#fi | ||
816 | |||
817 | mainmenu_option next_comment | ||
818 | comment 'ATA/ATAPI/MFM/RLL device support' | ||
819 | @@ -504,7 +504,7 @@ if [ "$CONFIG_ATARI" = "y" ]; then | ||
820 | bool 'Enhanced Real Time Clock Support' CONFIG_RTC | ||
821 | else | ||
822 | if [ "$CONFIG_SUN3" = "y" ]; then | ||
823 | - define_bool CONFIG_GEN_RTC y | ||
824 | + define_tristate CONFIG_GEN_RTC y | ||
825 | else | ||
826 | tristate 'Generic /dev/rtc emulation' CONFIG_GEN_RTC | ||
827 | fi | ||
828 | @@ -548,3 +548,4 @@ endmenu | ||
829 | |||
830 | source security/Config.in | ||
831 | source lib/Config.in | ||
832 | +source config.undef | ||
833 | Index: arch/mips/config.in | ||
834 | =================================================================== | ||
835 | RCS file: /usr/src/cvsroot/linux-2.5/arch/mips/config.in,v | ||
836 | retrieving revision 1.1.1.13 | ||
837 | diff -u -p -r1.1.1.13 config.in | ||
838 | --- arch/mips/config.in 12 Oct 2002 11:50:54 -00001.1.1.13 | ||
839 | +++ arch/mips/config.in16 Oct 2002 23:01:07 -0000 | ||
840 | @@ -25,7 +25,7 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; the | ||
841 | choice 'Galileo Chip Clock' \ | ||
842 | "75 CONFIG_SYSCLK_75\ | ||
843 | 83.3 CONFIG_SYSCLK_83\ | ||
844 | - 100 CONFIG_SYSCLK_100" CONFIG_SYSCLK_83 | ||
845 | + 100 CONFIG_SYSCLK_100_1" CONFIG_SYSCLK_83 | ||
846 | fi | ||
847 | bool 'Support for MIPS Atlas board (EXPERIMENTAL)' CONFIG_MIPS_ATLAS | ||
848 | bool 'Support for MIPS Malta board (EXPERIMENTAL)' CONFIG_MIPS_MALTA | ||
849 | @@ -84,8 +84,12 @@ unset CONFIG_SWAP_IO_SPACE | ||
850 | unset CONFIG_VIDEO_G364 | ||
851 | unset CONFIG_PC_KEYB | ||
852 | |||
853 | +define_bool CONFIG_ISA n | ||
854 | +define_bool CONFIG_EISA n | ||
855 | +define_bool CONFIG_PCI n | ||
856 | define_bool CONFIG_MCA n | ||
857 | define_bool CONFIG_SBUS n | ||
858 | +define_bool CONFIG_I8259 n | ||
859 | |||
860 | if [ "$CONFIG_MIPS_EV96100" = "y" ]; then | ||
861 | define_bool CONFIG_PCI y | ||
862 | @@ -138,7 +142,7 @@ if [ "$CONFIG_MIPS_MALTA" = "y" ]; then | ||
863 | fi | ||
864 | if [ "$CONFIG_MOMENCO_OCELOT" = "y" ]; then | ||
865 | define_bool CONFIG_PCI y | ||
866 | - define_bool CONFIG_SYSCLK_100 y | ||
867 | + define_bool CONFIG_SYSCLK_100_2 y | ||
868 | define_bool CONFIG_SWAP_IO_SPACE y | ||
869 | define_bool CONFIG_NEW_IRQ y | ||
870 | define_bool CONFIG_OLD_TIME_C y | ||
871 | @@ -201,19 +205,11 @@ if [ "$CONFIG_NINO" = "y" ]; then | ||
872 | define_bool CONFIG_PC_KEYB y | ||
873 | fi | ||
874 | |||
875 | -if [ "$CONFIG_ISA" != "y" ]; then | ||
876 | - define_bool CONFIG_ISA n | ||
877 | - define_bool CONFIG_EISA n | ||
878 | -else | ||
879 | +if [ "$CONFIG_ISA" = "y" ]; then | ||
880 | define_bool CONFIG_EISA y | ||
881 | fi | ||
882 | - | ||
883 | -if [ "$CONFIG_PCI" != "y" ]; then | ||
884 | - define_bool CONFIG_PCI n | ||
885 | -fi | ||
886 | - | ||
887 | -if [ "$CONFIG_I8259" != "y" ]; then | ||
888 | - define_bool CONFIG_I8259 n | ||
889 | +if [ "$CONFIG_SYSCLK_100_1" = "y" -o "$CONFIG_SYSCLK_100_2" = "y" ]; then | ||
890 | + define_bool CONFIG_SYSCLK_100 y | ||
891 | fi | ||
892 | endmenu | ||
893 | |||
894 | @@ -302,7 +298,7 @@ bool 'Support for hot-pluggable devices' | ||
895 | if [ "$CONFIG_HOTPLUG" = "y" ] ; then | ||
896 | source drivers/pcmcia/Config.in | ||
897 | else | ||
898 | - define_bool CONFIG_PCMCIA n | ||
899 | + define_tristate CONFIG_PCMCIA n | ||
900 | fi | ||
901 | |||
902 | if [ "$CONFIG_DECSTATION" = "y" ]; then | ||
903 | @@ -313,9 +309,9 @@ if [ "$CONFIG_DECSTATION" = "y" ]; then | ||
904 | fi | ||
905 | endmenu | ||
906 | |||
907 | -if [ "$CONFIG_ISA" = "y" ]; then | ||
908 | +#if [ "$CONFIG_ISA" = "y" ]; then | ||
909 | source drivers/pnp/Config.in | ||
910 | -fi | ||
911 | +#fi | ||
912 | |||
913 | source drivers/mtd/Config.in | ||
914 | |||
915 | @@ -351,10 +347,10 @@ if [ "$CONFIG_SCSI" != "n" ]; then | ||
916 | fi | ||
917 | endmenu | ||
918 | |||
919 | -if [ "$CONFIG_DECSTATION" != "y" -a \ | ||
920 | - "$CONFIG_SGI_IP22" != "y" ]; then | ||
921 | +#if [ "$CONFIG_DECSTATION" != "y" -a \ | ||
922 | +# "$CONFIG_SGI_IP22" != "y" ]; then | ||
923 | source drivers/message/i2o/Config.in | ||
924 | -fi | ||
925 | +#fi | ||
926 | |||
927 | if [ "$CONFIG_NET" = "y" ]; then | ||
928 | source net/Config.in | ||
929 | @@ -418,7 +414,7 @@ if [ "$CONFIG_DECSTATION" = "y" ]; then | ||
930 | # if [ "$CONFIG_ACCESSBUS" = "y" ]; then | ||
931 | # bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE | ||
932 | # fi | ||
933 | - bool 'Enhanced Real Time Clock Support' CONFIG_RTC | ||
934 | + tristate 'Enhanced Real Time Clock Support' CONFIG_RTC | ||
935 | |||
936 | endmenu | ||
937 | fi | ||
938 | @@ -453,10 +449,10 @@ if [ "$CONFIG_VT" = "y" ]; then | ||
939 | mainmenu_option next_comment | ||
940 | comment 'Console drivers' | ||
941 | bool 'VGA text console' CONFIG_VGA_CONSOLE | ||
942 | - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
943 | + #if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
944 | tristate 'MDA text console (dual-headed) (EXPERIMENTAL)' CONFIG_MDA_CONSOLE | ||
945 | source drivers/video/Config.in | ||
946 | - fi | ||
947 | + #fi | ||
948 | endmenu | ||
949 | fi | ||
950 | |||
951 | @@ -498,3 +494,4 @@ endmenu | ||
952 | |||
953 | source security/Config.in | ||
954 | source lib/Config.in | ||
955 | +source config.undef | ||
956 | Index: arch/mips64/config.in | ||
957 | =================================================================== | ||
958 | RCS file: /usr/src/cvsroot/linux-2.5/arch/mips64/config.in,v | ||
959 | retrieving revision 1.1.1.12 | ||
960 | diff -u -p -r1.1.1.12 config.in | ||
961 | --- arch/mips64/config.in 12 Oct 2002 11:52:33 -00001.1.1.12 | ||
962 | +++ arch/mips64/config.in16 Oct 2002 23:01:09 -0000 | ||
963 | @@ -24,10 +24,6 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then | ||
964 | fi | ||
965 | endmenu | ||
966 | |||
967 | -define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y | ||
968 | -define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n | ||
969 | -define_bool CONFIG_GENERIC_ISA_DMA y | ||
970 | - | ||
971 | # | ||
972 | # Select some configuration options automatically based on user selections | ||
973 | # | ||
974 | @@ -42,6 +38,13 @@ unset CONFIG_ISA | ||
975 | unset CONFIG_MAPPED_PCI_IO | ||
976 | unset CONFIG_PCI | ||
977 | |||
978 | +define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y | ||
979 | +define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n | ||
980 | +define_bool CONFIG_GENERIC_ISA_DMA y | ||
981 | +define_bool CONFIG_PCI n | ||
982 | +define_bool CONFIG_ISA n | ||
983 | +define_bool CONFIG_EISA n | ||
984 | + | ||
985 | if [ "$CONFIG_SGI_IP22" = "y" ]; then | ||
986 | define_bool CONFIG_BOOT_ELF32 y | ||
987 | define_bool CONFIG_ARC32 y | ||
988 | @@ -61,17 +64,10 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then | ||
989 | define_int CONFIG_L1_CACHE_SHIFT 7 | ||
990 | fi | ||
991 | |||
992 | -if [ "$CONFIG_ISA" != "y" ]; then | ||
993 | - define_bool CONFIG_ISA n | ||
994 | - define_bool CONFIG_EISA n | ||
995 | -else | ||
996 | +if [ "$CONFIG_ISA" = "y" ]; then | ||
997 | define_bool CONFIG_EISA y | ||
998 | fi | ||
999 | |||
1000 | -if [ "$CONFIG_PCI" != "y" ]; then | ||
1001 | - define_bool CONFIG_PCI n | ||
1002 | -fi | ||
1003 | - | ||
1004 | define_bool CONFIG_MCA n | ||
1005 | define_bool CONFIG_SBUS n | ||
1006 | |||
1007 | @@ -99,14 +95,12 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; the | ||
1008 | bool 'Kernel floating-point emulation' CONFIG_MIPS_FPU_EMULATOR | ||
1009 | fi | ||
1010 | |||
1011 | -source drivers/pci/Config.in | ||
1012 | - | ||
1013 | bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG | ||
1014 | |||
1015 | if [ "$CONFIG_HOTPLUG" = "y" ] ; then | ||
1016 | source drivers/pcmcia/Config.in | ||
1017 | else | ||
1018 | - define_bool CONFIG_PCMCIA n | ||
1019 | + define_tristate CONFIG_PCMCIA n | ||
1020 | fi | ||
1021 | |||
1022 | if [ "$CONFIG_ARC32" = "y" ]; then | ||
1023 | @@ -252,3 +246,4 @@ endmenu | ||
1024 | |||
1025 | source security/Config.in | ||
1026 | source lib/Config.in | ||
1027 | +source config.undef | ||
1028 | Index: arch/parisc/config.in | ||
1029 | =================================================================== | ||
1030 | RCS file: /usr/src/cvsroot/linux-2.5/arch/parisc/config.in,v | ||
1031 | retrieving revision 1.1.1.10 | ||
1032 | diff -u -p -r1.1.1.10 config.in | ||
1033 | --- arch/parisc/config.in 12 Oct 2002 11:52:43 -00001.1.1.10 | ||
1034 | +++ arch/parisc/config.in16 Oct 2002 23:01:10 -0000 | ||
1035 | @@ -196,3 +196,4 @@ endmenu | ||
1036 | |||
1037 | source security/Config.in | ||
1038 | source lib/Config.in | ||
1039 | +source config.undef | ||
1040 | Index: arch/ppc/config.in | ||
1041 | =================================================================== | ||
1042 | RCS file: /usr/src/cvsroot/linux-2.5/arch/ppc/config.in,v | ||
1043 | retrieving revision 1.1.1.21 | ||
1044 | diff -u -p -r1.1.1.21 config.in | ||
1045 | --- arch/ppc/config.in 12 Oct 2002 11:51:09 -00001.1.1.21 | ||
1046 | +++ arch/ppc/config.in16 Oct 2002 23:01:12 -0000 | ||
1047 | @@ -55,7 +55,7 @@ if [ "$CONFIG_8260" = "y" ]; then | ||
1048 | SBS8260 CONFIG_SBS8260\ | ||
1049 | RPXSUPER CONFIG_RPX6\ | ||
1050 | TQM8260 CONFIG_TQM8260\ | ||
1051 | - Willow CONFIG_WILLOW"Willow | ||
1052 | + Willow CONFIG_WILLOW_1"Willow | ||
1053 | fi | ||
1054 | |||
1055 | if [ "$CONFIG_40x" = "y" ]; then | ||
1056 | @@ -114,9 +114,9 @@ fi | ||
1057 | |||
1058 | if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "n" ]; then | ||
1059 | choice 'Machine Type' \ | ||
1060 | - "CHRP/PowerMac/PReP CONFIG_ALL_PPC \ | ||
1061 | + "CHRP/PowerMac/PReP CONFIG_ALL_PPC_CH\ | ||
1062 | Amiga-APUS CONFIG_APUS \ | ||
1063 | - Cogent-Willow CONFIG_WILLOW \ | ||
1064 | + Cogent-Willow CONFIG_WILLOW_2 \ | ||
1065 | Force-PowerCore CONFIG_PCORE \ | ||
1066 | Force-PowerPMC250 CONFIG_POWERPMC250\ | ||
1067 | Galileo-EV-64260-BP CONFIG_EV64260 \ | ||
1068 | @@ -145,6 +145,14 @@ if [ "$CONFIG_6xx" = "y" -a "$CONFIG_826 | ||
1069 | fi | ||
1070 | fi | ||
1071 | |||
1072 | +if [ "$CONFIG_POWER3" = "y" -o "$CONFIG_ALL_PPC_CH" = "y" ]; then | ||
1073 | + define_bool CONFIG_ALL_PPC y | ||
1074 | +fi | ||
1075 | + | ||
1076 | +if [ "$CONFIG_WILLOW_1" = "y" -o "$CONFIG_WILLOW_2" = "y" ]; then | ||
1077 | + define_bool CONFIG_WILLOW y | ||
1078 | +fi | ||
1079 | + | ||
1080 | if [ "$CONFIG_FORCE" = "y" -o "$CONFIG_MENF1" = "y" \ | ||
1081 | -o "$CONFIG_SANDPOINT" = "y" -o "$CONFIG_ZX4500" = "y" ]; then | ||
1082 | bool 'Enable MPC10x store gathering' CONFIG_MPC10X_STORE_GATHERING | ||
1083 | @@ -314,7 +322,7 @@ bool 'Support for hot-pluggable devices' | ||
1084 | if [ "$CONFIG_HOTPLUG" = "y" ]; then | ||
1085 | source drivers/pcmcia/Config.in | ||
1086 | else | ||
1087 | - define_bool CONFIG_PCMCIA n | ||
1088 | + define_tristate CONFIG_PCMCIA n | ||
1089 | fi | ||
1090 | |||
1091 | source drivers/parport/Config.in | ||
1092 | @@ -488,7 +496,7 @@ if [ "$CONFIG_PPC_ISERIES" = "y" ]; then | ||
1093 | fi | ||
1094 | if [ "$CONFIG_VIOCD" = "y" ]; then | ||
1095 | define_bool CONFIG_CD_NO_IDESCSI y | ||
1096 | - define_bool CONFIG_BLK_DEV_IDECD y | ||
1097 | + define_tristate CONFIG_BLK_DEV_IDECD y | ||
1098 | fi | ||
1099 | endmenu | ||
1100 | else | ||
1101 | @@ -617,3 +625,4 @@ endmenu | ||
1102 | |||
1103 | source security/Config.in | ||
1104 | |||
1105 | +source config.undef | ||
1106 | Index: arch/ppc64/config.in | ||
1107 | =================================================================== | ||
1108 | RCS file: /usr/src/cvsroot/linux-2.5/arch/ppc64/config.in,v | ||
1109 | retrieving revision 1.1.1.12 | ||
1110 | diff -u -p -r1.1.1.12 config.in | ||
1111 | --- arch/ppc64/config.in 12 Oct 2002 11:52:54 -00001.1.1.12 | ||
1112 | +++ arch/ppc64/config.in16 Oct 2002 23:01:13 -0000 | ||
1113 | @@ -68,8 +68,8 @@ if [ "$CONFIG_HOTPLUG" = "y" ]; then | ||
1114 | source drivers/pcmcia/Config.in | ||
1115 | source drivers/hotplug/Config.in | ||
1116 | else | ||
1117 | - define_bool CONFIG_PCMCIA n | ||
1118 | - define_bool CONFIG_HOTPLUG_PCI n | ||
1119 | + define_tristate CONFIG_PCMCIA n | ||
1120 | + define_tristate CONFIG_HOTPLUG_PCI n | ||
1121 | fi | ||
1122 | |||
1123 | if [ "$CONFIG_PPC_ISERIES" != "y" ]; then | ||
1124 | @@ -207,3 +207,4 @@ endmenu | ||
1125 | |||
1126 | source security/Config.in | ||
1127 | source lib/Config.in | ||
1128 | +source config.undef | ||
1129 | Index: arch/s390/config.in | ||
1130 | =================================================================== | ||
1131 | RCS file: /usr/src/cvsroot/linux-2.5/arch/s390/config.in,v | ||
1132 | retrieving revision 1.1.1.7 | ||
1133 | diff -u -p -r1.1.1.7 config.in | ||
1134 | --- arch/s390/config.in 12 Oct 2002 11:52:41 -00001.1.1.7 | ||
1135 | +++ arch/s390/config.in16 Oct 2002 23:01:15 -0000 | ||
1136 | @@ -77,3 +77,4 @@ endmenu | ||
1137 | |||
1138 | source security/Config.in | ||
1139 | source lib/Config.in | ||
1140 | +source config.undef | ||
1141 | Index: arch/s390x/config.in | ||
1142 | =================================================================== | ||
1143 | RCS file: /usr/src/cvsroot/linux-2.5/arch/s390x/config.in,v | ||
1144 | retrieving revision 1.1.1.7 | ||
1145 | diff -u -p -r1.1.1.7 config.in | ||
1146 | --- arch/s390x/config.in 12 Oct 2002 11:52:52 -00001.1.1.7 | ||
1147 | +++ arch/s390x/config.in16 Oct 2002 23:01:15 -0000 | ||
1148 | @@ -81,3 +81,4 @@ endmenu | ||
1149 | |||
1150 | source security/Config.in | ||
1151 | source lib/Config.in | ||
1152 | +source config.undef | ||
1153 | Index: arch/sh/config.in | ||
1154 | =================================================================== | ||
1155 | RCS file: /usr/src/cvsroot/linux-2.5/arch/sh/config.in,v | ||
1156 | retrieving revision 1.1.1.10 | ||
1157 | diff -u -p -r1.1.1.10 config.in | ||
1158 | --- arch/sh/config.in 27 Aug 2002 23:43:48 -00001.1.1.10 | ||
1159 | +++ arch/sh/config.in16 Oct 2002 23:01:15 -0000 | ||
1160 | @@ -186,7 +186,7 @@ bool 'Support for hot-pluggable devices' | ||
1161 | if [ "$CONFIG_HOTPLUG" = "y" ] ; then | ||
1162 | source drivers/pcmcia/Config.in | ||
1163 | else | ||
1164 | - define_bool CONFIG_PCMCIA n | ||
1165 | + define_tristate CONFIG_PCMCIA n | ||
1166 | fi | ||
1167 | |||
1168 | if [ "$CONFIG_PROC_FS" = "y" ]; then | ||
1169 | @@ -261,9 +261,9 @@ endmenu | ||
1170 | # | ||
1171 | source drivers/input/Config.in | ||
1172 | |||
1173 | -if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then | ||
1174 | - source drivers/maple/Config.in | ||
1175 | -fi | ||
1176 | +#if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then | ||
1177 | +# source drivers/maple/Config.in | ||
1178 | +#fi | ||
1179 | |||
1180 | mainmenu_option next_comment | ||
1181 | comment 'Character devices' | ||
1182 | @@ -306,7 +306,7 @@ if [ "$CONFIG_SH_DREAMCAST" = "y" -a "$C | ||
1183 | endmenu | ||
1184 | fi | ||
1185 | |||
1186 | -source drivers/char/joystick/Config.in | ||
1187 | +#source drivers/char/joystick/Config.in | ||
1188 | |||
1189 | if [ "$CONFIG_PARPORT" != "n" ]; then | ||
1190 | dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT | ||
1191 | @@ -341,10 +341,10 @@ if [ "$CONFIG_VT" = "y" ]; then | ||
1192 | comment 'Console drivers' | ||
1193 | bool 'VGA text console' CONFIG_VGA_CONSOLE | ||
1194 | bool 'Video mode selection support' CONFIG_VIDEO_SELECT | ||
1195 | - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
1196 | + #if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
1197 | tristate 'MDA text console (dual-headed) (EXPERIMENTAL)' CONFIG_MDA_CONSOLE | ||
1198 | source drivers/video/Config.in | ||
1199 | - fi | ||
1200 | + #fi | ||
1201 | endmenu | ||
1202 | fi | ||
1203 | |||
1204 | @@ -370,3 +370,4 @@ endmenu | ||
1205 | |||
1206 | source security/Config.in | ||
1207 | source lib/Config.in | ||
1208 | +source config.undef | ||
1209 | Index: arch/sparc/config.in | ||
1210 | =================================================================== | ||
1211 | RCS file: /usr/src/cvsroot/linux-2.5/arch/sparc/config.in,v | ||
1212 | retrieving revision 1.1.1.15 | ||
1213 | diff -u -p -r1.1.1.15 config.in | ||
1214 | --- arch/sparc/config.in 12 Oct 2002 11:50:47 -00001.1.1.15 | ||
1215 | +++ arch/sparc/config.in16 Oct 2002 23:01:16 -0000 | ||
1216 | @@ -30,7 +30,7 @@ define_bool CONFIG_SPARC32 y | ||
1217 | define_bool CONFIG_ISA n | ||
1218 | define_bool CONFIG_EISA n | ||
1219 | define_bool CONFIG_MCA n | ||
1220 | -define_bool CONFIG_PCMCIA n | ||
1221 | +define_tristate CONFIG_PCMCIA n | ||
1222 | define_bool CONFIG_SBUS y | ||
1223 | define_bool CONFIG_SBUSCHAR y | ||
1224 | define_bool CONFIG_SERIAL_CONSOLE y | ||
1225 | @@ -41,10 +41,11 @@ define_bool CONFIG_RWSEM_XCHGADD_ALGORIT | ||
1226 | define_bool CONFIG_SUN_PM y | ||
1227 | |||
1228 | bool 'Support for SUN4 machines (disables SUN4[CDM] support)' CONFIG_SUN4 | ||
1229 | -if [ "$CONFIG_SUN4" != "y" ]; then | ||
1230 | +#if [ "$CONFIG_SUN4" != "y" ]; then | ||
1231 | bool 'Support for PCI and PS/2 keyboard/mouse' CONFIG_PCI | ||
1232 | source drivers/pci/Config.in | ||
1233 | -else | ||
1234 | +#else | ||
1235 | +if [ "$CONFIG_SUN4" = "y" ]; then | ||
1236 | define_bool CONFIG_PCI n | ||
1237 | fi | ||
1238 | |||
1239 | @@ -72,9 +73,9 @@ endmenu | ||
1240 | source drivers/mtd/Config.in | ||
1241 | |||
1242 | source drivers/serial/Config.in | ||
1243 | -if [ "$CONFIG_SUN4" != "y" ]; then | ||
1244 | +#if [ "$CONFIG_SUN4" != "y" ]; then | ||
1245 | source drivers/sbus/char/Config.in | ||
1246 | -fi | ||
1247 | +#fi | ||
1248 | |||
1249 | mainmenu_option next_comment | ||
1250 | comment 'Block devices' | ||
1251 | @@ -95,7 +96,7 @@ dep_bool ' Initial RAM disk (initrd) su | ||
1252 | endmenu | ||
1253 | |||
1254 | # Don't frighten a common SBus user | ||
1255 | -if [ "$CONFIG_PCI" = "y" ]; then | ||
1256 | +#if [ "$CONFIG_PCI" = "y" ]; then | ||
1257 | |||
1258 | mainmenu_option next_comment | ||
1259 | comment 'ATA/ATAPI/MFM/RLL support' | ||
1260 | @@ -108,8 +109,9 @@ if [ "$CONFIG_PCI" = "y" ]; then | ||
1261 | define_bool CONFIG_BLK_DEV_HD n | ||
1262 | fi | ||
1263 | endmenu | ||
1264 | -else | ||
1265 | - define_bool CONFIG_IDE n | ||
1266 | +#else | ||
1267 | +if [ "$CONFIG_PCI" != "y" ]; then | ||
1268 | + define_tristate CONFIG_IDE n | ||
1269 | define_bool CONFIG_BLK_DEV_HD n | ||
1270 | fi | ||
1271 | |||
1272 | @@ -226,6 +228,9 @@ source drivers/input/Config.in | ||
1273 | |||
1274 | source fs/Config.in | ||
1275 | |||
1276 | +mainmenu_option next_comment | ||
1277 | +comment 'Sound' | ||
1278 | + | ||
1279 | tristate 'Sound card support' CONFIG_SOUND | ||
1280 | if [ "$CONFIG_SOUND" != "n" ]; then | ||
1281 | source sound/Config.in | ||
1282 | @@ -253,3 +258,4 @@ endmenu | ||
1283 | |||
1284 | source security/Config.in | ||
1285 | source lib/Config.in | ||
1286 | +source config.undef | ||
1287 | Index: arch/sparc64/config.in | ||
1288 | =================================================================== | ||
1289 | RCS file: /usr/src/cvsroot/linux-2.5/arch/sparc64/config.in,v | ||
1290 | retrieving revision 1.1.1.15 | ||
1291 | diff -u -p -r1.1.1.15 config.in | ||
1292 | --- arch/sparc64/config.in 12 Oct 2002 11:51:46 -00001.1.1.15 | ||
1293 | +++ arch/sparc64/config.in16 Oct 2002 23:01:17 -0000 | ||
1294 | @@ -35,17 +35,17 @@ define_bool CONFIG_RWSEM_GENERIC_SPINLOC | ||
1295 | define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM y | ||
1296 | define_bool CONFIG_GENERIC_ISA_DMA y | ||
1297 | define_bool CONFIG_ISA n | ||
1298 | -define_bool CONFIG_ISAPNP n | ||
1299 | +define_bool CONFIG_ISAPNP n | ||
1300 | define_bool CONFIG_EISA n | ||
1301 | define_bool CONFIG_MCA n | ||
1302 | -define_bool CONFIG_PCMCIA n | ||
1303 | +define_tristate CONFIG_PCMCIA n | ||
1304 | define_bool CONFIG_SBUS y | ||
1305 | define_bool CONFIG_SBUSCHAR y | ||
1306 | define_bool CONFIG_SUN_AUXIO y | ||
1307 | define_bool CONFIG_SUN_IO y | ||
1308 | bool 'PCI support' CONFIG_PCI | ||
1309 | if [ "$CONFIG_PCI" = "y" ] ; then | ||
1310 | - define_bool CONFIG_RTC y | ||
1311 | + define_tristate CONFIG_RTC y | ||
1312 | fi | ||
1313 | source drivers/pci/Config.in | ||
1314 | |||
1315 | @@ -153,8 +153,9 @@ if [ "$CONFIG_SCSI" != "n" ]; then | ||
1316 | dep_tristate 'Sparc ESP Scsi Driver' CONFIG_SCSI_SUNESP $CONFIG_SCSI | ||
1317 | dep_tristate 'PTI Qlogic, ISP Driver' CONFIG_SCSI_QLOGICPTI $CONFIG_SCSI | ||
1318 | |||
1319 | - if [ "$CONFIG_PCI" != "n" ]; then | ||
1320 | + #if [ "$CONFIG_PCI" != "n" ]; then | ||
1321 | source drivers/scsi/aic7xxx/Config.in | ||
1322 | + if [ "$CONFIG_PCI" != "n" ]; then | ||
1323 | if [ "$CONFIG_SCSI_AIC7XXX" != "y" ]; then | ||
1324 | dep_tristate 'Old Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX_OLD $CONFIG_SCSI | ||
1325 | if [ "$CONFIG_SCSI_AIC7XXX_OLD" != "n" ]; then | ||
1326 | @@ -202,9 +203,9 @@ endmenu | ||
1327 | |||
1328 | source drivers/fc4/Config.in | ||
1329 | |||
1330 | -if [ "$CONFIG_PCI" = "y" ]; then | ||
1331 | +#if [ "$CONFIG_PCI" = "y" ]; then | ||
1332 | source drivers/message/fusion/Config.in | ||
1333 | -fi | ||
1334 | +#fi | ||
1335 | |||
1336 | source drivers/ieee1394/Config.in | ||
1337 | |||
1338 | @@ -296,3 +297,4 @@ endmenu | ||
1339 | |||
1340 | source security/Config.in | ||
1341 | source lib/Config.in | ||
1342 | +source config.undef | ||
1343 | Index: arch/um/config.in | ||
1344 | =================================================================== | ||
1345 | RCS file: /usr/src/cvsroot/linux-2.5/arch/um/config.in,v | ||
1346 | retrieving revision 1.1.1.3 | ||
1347 | diff -u -p -r1.1.1.3 config.in | ||
1348 | --- arch/um/config.in 16 Oct 2002 19:46:03 -00001.1.1.3 | ||
1349 | +++ arch/um/config.in16 Oct 2002 23:01:18 -0000 | ||
1350 | @@ -91,3 +91,4 @@ fi | ||
1351 | dep_bool 'Enable gprof support' CONFIG_GPROF $CONFIG_DEBUGSYM | ||
1352 | dep_bool 'Enable gcov support' CONFIG_GCOV $CONFIG_DEBUGSYM | ||
1353 | endmenu | ||
1354 | +source config.undef | ||
1355 | Index: arch/x86_64/config.in | ||
1356 | =================================================================== | ||
1357 | RCS file: /usr/src/cvsroot/linux-2.5/arch/x86_64/config.in,v | ||
1358 | retrieving revision 1.1.1.11 | ||
1359 | diff -u -p -r1.1.1.11 config.in | ||
1360 | --- arch/x86_64/config.in 12 Oct 2002 11:53:03 -00001.1.1.11 | ||
1361 | +++ arch/x86_64/config.in16 Oct 2002 23:01:20 -0000 | ||
1362 | @@ -90,7 +90,7 @@ if [ "$CONFIG_HOTPLUG" = "y" ] ; then | ||
1363 | source drivers/pcmcia/Config.in | ||
1364 | source drivers/hotplug/Config.in | ||
1365 | else | ||
1366 | - define_bool CONFIG_PCMCIA n | ||
1367 | + define_tristate CONFIG_PCMCIA n | ||
1368 | fi | ||
1369 | |||
1370 | endmenu | ||
1371 | @@ -193,10 +193,10 @@ if [ "$CONFIG_VT" = "y" ]; then | ||
1372 | comment 'Console drivers' | ||
1373 | bool 'VGA text console' CONFIG_VGA_CONSOLE | ||
1374 | bool 'Video mode selection support' CONFIG_VIDEO_SELECT | ||
1375 | - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
1376 | + #if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
1377 | tristate 'MDA text console (dual-headed) (EXPERIMENTAL)' CONFIG_MDA_CONSOLE | ||
1378 | source drivers/video/Config.in | ||
1379 | - fi | ||
1380 | + #fi | ||
1381 | endmenu | ||
1382 | fi | ||
1383 | |||
1384 | @@ -229,3 +229,4 @@ endmenu | ||
1385 | |||
1386 | source security/Config.in | ||
1387 | source lib/Config.in | ||
1388 | +source config.undef | ||
1389 | Index: drivers/acpi/Config.in | ||
1390 | =================================================================== | ||
1391 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/acpi/Config.in,v | ||
1392 | retrieving revision 1.1.1.10 | ||
1393 | diff -u -p -r1.1.1.10 Config.in | ||
1394 | --- drivers/acpi/Config.in 27 Sep 2002 22:31:52 -00001.1.1.10 | ||
1395 | +++ drivers/acpi/Config.in16 Oct 2002 23:01:21 -0000 | ||
1396 | @@ -51,10 +51,10 @@ if [ "$CONFIG_IA64" = "y" ]; then | ||
1397 | define_bool CONFIG_ACPI_POWER n | ||
1398 | define_bool CONFIG_ACPI_SYSTEM n | ||
1399 | define_bool CONFIG_ACPI_SLEEP n | ||
1400 | - define_bool CONFIG_ACPI_BUTTON n | ||
1401 | - define_bool CONFIG_ACPI_FAN n | ||
1402 | - define_bool CONFIG_ACPI_PROCESSOR n | ||
1403 | - define_bool CONFIG_ACPI_THERMAL n | ||
1404 | + define_tristate CONFIG_ACPI_BUTTON n | ||
1405 | + define_tristate CONFIG_ACPI_FAN n | ||
1406 | + define_tristate CONFIG_ACPI_PROCESSOR n | ||
1407 | + define_tristate CONFIG_ACPI_THERMAL n | ||
1408 | define_bool CONFIG_ACPI_NUMA y | ||
1409 | fi | ||
1410 | |||
1411 | Index: drivers/char/agp/Config.in | ||
1412 | =================================================================== | ||
1413 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/char/agp/Config.in,v | ||
1414 | retrieving revision 1.1.1.2 | ||
1415 | diff -u -p -r1.1.1.2 Config.in | ||
1416 | --- drivers/char/agp/Config.in 27 Sep 2002 22:30:24 -00001.1.1.2 | ||
1417 | +++ drivers/char/agp/Config.in16 Oct 2002 23:01:24 -0000 | ||
1418 | @@ -1,8 +1,9 @@ | ||
1419 | |||
1420 | -if [ "$CONFIG_GART_IOMMU" = "y" ]; then | ||
1421 | - dep_bool '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP | ||
1422 | +if [ "$CONFIG_GART_IOMMU" != "y" ]; then | ||
1423 | + tristate '/dev/agpgart (AGP Support)' CONFIG_AGP | ||
1424 | else | ||
1425 | - dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP | ||
1426 | + bool '/dev/agpgart (AGP Support)' CONFIG_AGP_GART | ||
1427 | + define_tristate CONFIG_AGP $CONFIG_AGP_GART | ||
1428 | fi | ||
1429 | if [ "$CONFIG_AGP" != "n" ]; then | ||
1430 | bool ' Intel 440LX/BX/GX and I815/I820/I830M/I830MP/I840/I845/I850/I860 support' CONFIG_AGP_INTEL | ||
1431 | Index: drivers/message/fusion/Config.in | ||
1432 | =================================================================== | ||
1433 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/message/fusion/Config.in,v | ||
1434 | retrieving revision 1.1.1.4 | ||
1435 | diff -u -p -r1.1.1.4 Config.in | ||
1436 | --- drivers/message/fusion/Config.in 16 Oct 2002 19:44:14 -00001.1.1.4 | ||
1437 | +++ drivers/message/fusion/Config.in16 Oct 2002 23:01:29 -0000 | ||
1438 | @@ -18,10 +18,10 @@ if [ "$CONFIG_FUSION" = "y" -o "$CONFIG_ | ||
1439 | dep_tristate " Fusion MPT misc device (ioctl) driver" CONFIG_FUSION_CTL $CONFIG_FUSION m | ||
1440 | fi | ||
1441 | |||
1442 | - dep_tristate " Fusion MPT LAN driver" CONFIG_FUSION_LAN $CONFIG_FUSION $CONFIG_NET | ||
1443 | - if [ "$CONFIG_FUSION_LAN" != "n" ]; then | ||
1444 | - define_bool CONFIG_NET_FC y | ||
1445 | - fi | ||
1446 | + dep_tristate " Fusion MPT LAN driver" CONFIG_FUSION_LAN $CONFIG_FUSION $CONFIG_NET $CONFIG_NET_FC | ||
1447 | +# if [ "$CONFIG_FUSION_LAN" != "n" ]; then | ||
1448 | +# define_bool CONFIG_NET_FC y | ||
1449 | +# fi | ||
1450 | |||
1451 | else | ||
1452 | |||
1453 | @@ -29,9 +29,9 @@ else | ||
1454 | # These <should> be define_tristate, but we leave them define_bool | ||
1455 | # for backward compatibility with pre-linux-2.2.15 kernels. | ||
1456 | # (Bugzilla:fibrebugs, #384) | ||
1457 | - define_bool CONFIG_FUSION_ISENSE n | ||
1458 | - define_bool CONFIG_FUSION_CTL n | ||
1459 | - define_bool CONFIG_FUSION_LAN n | ||
1460 | + define_tristate CONFIG_FUSION_ISENSE n | ||
1461 | + define_tristate CONFIG_FUSION_CTL n | ||
1462 | + define_tristate CONFIG_FUSION_LAN n | ||
1463 | |||
1464 | fi | ||
1465 | |||
1466 | Index: drivers/mtd/chips/Config.in | ||
1467 | =================================================================== | ||
1468 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/mtd/chips/Config.in,v | ||
1469 | retrieving revision 1.1.1.1 | ||
1470 | diff -u -p -r1.1.1.1 Config.in | ||
1471 | --- drivers/mtd/chips/Config.in 26 Nov 2001 19:31:18 -00001.1.1.1 | ||
1472 | +++ drivers/mtd/chips/Config.in16 Oct 2002 23:01:30 -0000 | ||
1473 | @@ -11,12 +11,12 @@ dep_tristate ' Detect flash chips by Co | ||
1474 | dep_tristate ' Detect non-CFI AMD/JEDEC-compatible flash chips' CONFIG_MTD_JEDECPROBE $CONFIG_MTD | ||
1475 | |||
1476 | if [ "$CONFIG_MTD_CFI" = "y" -o "$CONFIG_MTD_INTELPROBE" = "y" -o "$CONFIG_MTD_JEDECPROBE" = "y" ]; then | ||
1477 | - define_bool CONFIG_MTD_GEN_PROBE y | ||
1478 | + define_tristate CONFIG_MTD_GEN_PROBE y | ||
1479 | else | ||
1480 | if [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_INTELPROBE" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then | ||
1481 | - define_bool CONFIG_MTD_GEN_PROBE m | ||
1482 | + define_tristate CONFIG_MTD_GEN_PROBE m | ||
1483 | else | ||
1484 | - define_bool CONFIG_MTD_GEN_PROBE n | ||
1485 | + define_tristate CONFIG_MTD_GEN_PROBE n | ||
1486 | fi | ||
1487 | fi | ||
1488 | if [ "$CONFIG_MTD_GEN_PROBE" = "y" -o "$CONFIG_MTD_GEN_PROBE" = "m" ]; then | ||
1489 | Index: drivers/mtd/devices/Config.in | ||
1490 | =================================================================== | ||
1491 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/mtd/devices/Config.in,v | ||
1492 | retrieving revision 1.1.1.1 | ||
1493 | diff -u -p -r1.1.1.1 Config.in | ||
1494 | --- drivers/mtd/devices/Config.in 26 Nov 2001 19:31:18 -00001.1.1.1 | ||
1495 | +++ drivers/mtd/devices/Config.in16 Oct 2002 23:01:30 -0000 | ||
1496 | @@ -29,12 +29,12 @@ comment 'Disk-On-Chip Device Drivers' | ||
1497 | dep_tristate ' M-Systems Disk-On-Chip 2000 and Millennium' CONFIG_MTD_DOC2000 $CONFIG_MTD | ||
1498 | dep_tristate ' M-Systems Disk-On-Chip Millennium-only alternative driver (see help)' CONFIG_MTD_DOC2001 $CONFIG_MTD | ||
1499 | if [ "$CONFIG_MTD_DOC2001" = "y" -o "$CONFIG_MTD_DOC2000" = "y" ]; then | ||
1500 | - define_bool CONFIG_MTD_DOCPROBE y | ||
1501 | + define_tristate CONFIG_MTD_DOCPROBE y | ||
1502 | else | ||
1503 | if [ "$CONFIG_MTD_DOC2001" = "m" -o "$CONFIG_MTD_DOC2000" = "m" ]; then | ||
1504 | - define_bool CONFIG_MTD_DOCPROBE m | ||
1505 | + define_tristate CONFIG_MTD_DOCPROBE m | ||
1506 | else | ||
1507 | - define_bool CONFIG_MTD_DOCPROBE n | ||
1508 | + define_tristate CONFIG_MTD_DOCPROBE n | ||
1509 | fi | ||
1510 | fi | ||
1511 | |||
1512 | Index: drivers/net/Config.in | ||
1513 | =================================================================== | ||
1514 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/net/Config.in,v | ||
1515 | retrieving revision 1.1.1.13 | ||
1516 | diff -u -p -r1.1.1.13 Config.in | ||
1517 | --- drivers/net/Config.in 7 Oct 2002 19:16:13 -00001.1.1.13 | ||
1518 | +++ drivers/net/Config.in16 Oct 2002 23:01:30 -0000 | ||
1519 | @@ -305,6 +305,8 @@ if [ "$CONFIG_NET_RADIO" = "y" ]; then | ||
1520 | |||
1521 | # New directory for Wireless LAN devices - cards above will move there | ||
1522 | source drivers/net/wireless/Config.in | ||
1523 | +else | ||
1524 | + define_tristate CONFIG_AIRONET4500 n | ||
1525 | fi | ||
1526 | |||
1527 | endmenu | ||
1528 | Index: drivers/parport/Config.in | ||
1529 | =================================================================== | ||
1530 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/parport/Config.in,v | ||
1531 | retrieving revision 1.1.1.2 | ||
1532 | diff -u -p -r1.1.1.2 Config.in | ||
1533 | --- drivers/parport/Config.in 31 Jan 2002 22:18:24 -00001.1.1.2 | ||
1534 | +++ drivers/parport/Config.in16 Oct 2002 23:01:33 -0000 | ||
1535 | @@ -11,8 +11,8 @@ comment 'Parallel port support' | ||
1536 | tristate 'Parallel port support' CONFIG_PARPORT | ||
1537 | if [ "$CONFIG_PARPORT" != "n" ]; then | ||
1538 | dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT | ||
1539 | - if [ "$CONFIG_PARPORT_PC" != "n" -a "$CONFIG_SERIAL" != "n" ]; then | ||
1540 | - if [ "$CONFIG_SERIAL" = "m" ]; then | ||
1541 | + if [ "$CONFIG_PARPORT_PC" != "n" -a "$CONFIG_SERIAL_8250" != "n" ]; then | ||
1542 | + if [ "$CONFIG_SERIAL_8250" = "m" ]; then | ||
1543 | define_tristate CONFIG_PARPORT_PC_CML1 m | ||
1544 | else | ||
1545 | define_tristate CONFIG_PARPORT_PC_CML1 $CONFIG_PARPORT_PC | ||
1546 | Index: drivers/pnp/Config.in | ||
1547 | =================================================================== | ||
1548 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/pnp/Config.in,v | ||
1549 | retrieving revision 1.1.1.3 | ||
1550 | diff -u -p -r1.1.1.3 Config.in | ||
1551 | --- drivers/pnp/Config.in 19 Oct 2002 11:36:15 -00001.1.1.3 | ||
1552 | +++ drivers/pnp/Config.in19 Oct 2002 13:00:10 -0000 | ||
1553 | @@ -4,15 +4,17 @@ | ||
1554 | mainmenu_option next_comment | ||
1555 | comment 'Plug and Play configuration' | ||
1556 | |||
1557 | -dep_bool 'Plug and Play support' CONFIG_PNP | ||
1558 | +bool 'Plug and Play support' CONFIG_PNP | ||
1559 | |||
1560 | - dep_bool ' Plug and Play device name database' CONFIG_PNP_NAMES $CONFIG_PNP | ||
1561 | - dep_bool ' PnP Debug Messages' CONFIG_PNP_DEBUG $CONFIG_PNP | ||
1562 | +if [ "$CONFIG_PNP" = "y" ]; then | ||
1563 | + bool ' Plug and Play device name database' CONFIG_PNP_NAMES | ||
1564 | + bool ' PnP Debug Messages' CONFIG_PNP_DEBUG | ||
1565 | |||
1566 | -comment 'Protocols' $CONFIG_PNP | ||
1567 | + comment 'Protocols' | ||
1568 | |||
1569 | -if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
1570 | - dep_bool ' ISA Plug and Play support (EXPERIMENTAL)' CONFIG_ISAPNP $CONFIG_PNP | ||
1571 | - dep_bool ' Plug and Play BIOS support (EXPERIMENTAL)' CONFIG_PNPBIOS $CONFIG_PNP | ||
1572 | + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then | ||
1573 | + bool ' ISA Plug and Play support (EXPERIMENTAL)' CONFIG_ISAPNP | ||
1574 | + bool ' Plug and Play BIOS support (EXPERIMENTAL)' CONFIG_PNPBIOS | ||
1575 | + fi | ||
1576 | fi | ||
1577 | endmenu | ||
1578 | Index: drivers/serial/Config.in | ||
1579 | =================================================================== | ||
1580 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/serial/Config.in,v | ||
1581 | retrieving revision 1.1.1.4 | ||
1582 | diff -u -p -r1.1.1.4 Config.in | ||
1583 | --- drivers/serial/Config.in 16 Oct 2002 19:42:48 -00001.1.1.4 | ||
1584 | +++ drivers/serial/Config.in16 Oct 2002 23:01:36 -0000 | ||
1585 | @@ -62,14 +62,14 @@ if [ "$CONFIG_SERIAL_AMBA" = "y" -o "$ | ||
1586 | "$CONFIG_SERIAL_ANAKIN" = "y" -o "$CONFIG_SERIAL_UART00" = "y" -o \ | ||
1587 | "$CONFIG_SERIAL_8250" = "y" -o "$CONFIG_SERIAL_ROCKETPORT" = "y" -o \ | ||
1588 | "$CONFIG_SERIAL_SUNCORE" = "y" ]; then | ||
1589 | - define_bool CONFIG_SERIAL_CORE y | ||
1590 | + define_tristate CONFIG_SERIAL_CORE y | ||
1591 | else | ||
1592 | if [ "$CONFIG_SERIAL_AMBA" = "m" -o "$CONFIG_SERIAL_CLPS711X" = "m" -o \ | ||
1593 | "$CONFIG_SERIAL_21285" = "m" -o "$CONFIG_SERIAL_SA1100" = "m" -o \ | ||
1594 | "$CONFIG_SERIAL_ANAKIN" = "m" -o "$CONFIG_SERIAL_UART00" = "m" -o \ | ||
1595 | "$CONFIG_SERIAL_8250" = "m" -o "$CONFIG_SERIAL_ROCKETPORT" = "m" -o \ | ||
1596 | "$CONFIG_SERIAL_SUNCORE" = "m" ]; then | ||
1597 | - define_bool CONFIG_SERIAL_CORE m | ||
1598 | + define_tristate CONFIG_SERIAL_CORE m | ||
1599 | fi | ||
1600 | fi | ||
1601 | if [ "$CONFIG_SERIAL_AMBA_CONSOLE" = "y" -o \ | ||
1602 | Index: drivers/usb/Config.in | ||
1603 | =================================================================== | ||
1604 | RCS file: /usr/src/cvsroot/linux-2.5/drivers/usb/Config.in,v | ||
1605 | retrieving revision 1.1.1.11 | ||
1606 | diff -u -p -r1.1.1.11 Config.in | ||
1607 | --- drivers/usb/Config.in 27 Aug 2002 23:41:47 -00001.1.1.11 | ||
1608 | +++ drivers/usb/Config.in16 Oct 2002 23:01:36 -0000 | ||
1609 | @@ -8,7 +8,7 @@ comment 'USB support' | ||
1610 | if [ "$CONFIG_PCI" = "y" -o "$CONFIG_SA1111" = "y" ]; then | ||
1611 | tristate 'Support for USB' CONFIG_USB | ||
1612 | else | ||
1613 | - define_bool CONFIG_USB n | ||
1614 | + define_tristate CONFIG_USB n | ||
1615 | fi | ||
1616 | |||
1617 | if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then | ||
1618 | Index: fs/Config.in | ||
1619 | =================================================================== | ||
1620 | RCS file: /usr/src/cvsroot/linux-2.5/fs/Config.in,v | ||
1621 | retrieving revision 1.1.1.18 | ||
1622 | diff -u -p -r1.1.1.18 Config.in | ||
1623 | --- fs/Config.in 16 Oct 2002 19:38:54 -00001.1.1.18 | ||
1624 | +++ fs/Config.in16 Oct 2002 23:01:39 -0000 | ||
1625 | @@ -173,7 +173,7 @@ if [ "$CONFIG_NET" = "y" ]; then | ||
1626 | else | ||
1627 | # for fs/nls/Config.in | ||
1628 | define_bool CONFIG_NCPFS_NLS n | ||
1629 | - define_bool CONFIG_SMB_FS n | ||
1630 | + define_tristate CONFIG_SMB_FS n | ||
1631 | fi | ||
1632 | |||
1633 | if [ "$CONFIG_ZISOFS" = "y" ]; then | ||
1634 | Index: scripts/Makefile | ||
1635 | =================================================================== | ||
1636 | RCS file: /usr/src/cvsroot/linux-2.5/scripts/Makefile,v | ||
1637 | retrieving revision 1.1.1.7 | ||
1638 | diff -u -p -r1.1.1.7 Makefile | ||
1639 | --- scripts/Makefile 7 Oct 2002 19:20:55 -00001.1.1.7 | ||
1640 | +++ scripts/Makefile16 Oct 2002 23:02:01 -0000 | ||
1641 | @@ -11,7 +11,7 @@ | ||
1642 | |||
1643 | EXTRA_TARGETS := fixdep split-include docproc conmakehash | ||
1644 | |||
1645 | -subdir-:= lxdialog | ||
1646 | +subdir-:= lxdialog kconfig | ||
1647 | |||
1648 | # Yikes. We need to build this stuff here even if the user only wants | ||
1649 | # modules. | ||
1650 | Index: sound/oss/Config.in | ||
1651 | =================================================================== | ||
1652 | RCS file: /usr/src/cvsroot/linux-2.5/sound/oss/Config.in,v | ||
1653 | retrieving revision 1.1.1.4 | ||
1654 | diff -u -p -r1.1.1.4 Config.in | ||
1655 | --- sound/oss/Config.in 27 Aug 2002 23:44:49 -00001.1.1.4 | ||
1656 | +++ sound/oss/Config.in16 Oct 2002 23:02:04 -0000 | ||
1657 | @@ -201,12 +201,3 @@ fi | ||
1658 | |||
1659 | dep_tristate ' TV card (bt848) mixer support' CONFIG_SOUND_TVMIXER $CONFIG_SOUND $CONFIG_I2C | ||
1660 | |||
1661 | -# A cross directory dependence. The sound modules will need gameport.o compiled in, | ||
1662 | -# but it resides in the drivers/char/joystick directory. This define_tristate takes | ||
1663 | -# care of that. --Vojtech | ||
1664 | - | ||
1665 | -if [ "$CONFIG_INPUT_GAMEPORT" != "n" ]; then | ||
1666 | - if [ "$CONFIG_SOUND_ESSSOLO1" = "y" -o "$CONFIG_SOUND_ES1370" = "y" -o "$CONFIG_SOUND_ES1371" = "y" -o "$CONFIG_SOUND_SONICVIBES" = "y" ]; then | ||
1667 | - define_tristate CONFIG_INPUT_GAMEPORT y | ||
1668 | - fi | ||
1669 | -fi | ||
1670 | diff -ur config.undef config.undef | ||
1671 | --- config.undef1970-01-01 01:00:00.000000000 +0100 | ||
1672 | +++ config.undef2002-08-22 20:17:58.000000000 +0200 | ||
1673 | @@ -0,0 +1,210 @@ | ||
1674 | +mainmenu_option next_comment | ||
1675 | +comment '' | ||
1676 | +define_bool CONFIG_IBM_OCP n | ||
1677 | +define_bool CONFIG_VISWS n | ||
1678 | +define_bool CONFIG_HUB6 n | ||
1679 | +define_bool CONFIG_ALL_PPC n | ||
1680 | +define_bool CONFIG_ALPHA_BOOK1 n | ||
1681 | +define_bool CONFIG_8xx n | ||
1682 | +define_bool CONFIG_SUN3 n | ||
1683 | +define_bool CONFIG_ARCH_EBSA110 n | ||
1684 | +define_bool CONFIG_HP300 n | ||
1685 | +define_bool CONFIG_ARCH_NETWINDER n | ||
1686 | +define_bool CONFIG_ARCH_ANAKIN n | ||
1687 | +define_bool CONFIG_SERIAL_CONSOLE n | ||
1688 | +define_bool CONFIG_MIPS_GT96100 n | ||
1689 | +define_bool CONFIG_MOMENCO_OCELOT n | ||
1690 | +define_bool CONFIG_IA64_HP_SIM n | ||
1691 | +define_bool CONFIG_IA64_SGI_SN n | ||
1692 | +define_bool CONFIG_MIPS n | ||
1693 | +define_bool CONFIG_ARCH_A5K n | ||
1694 | +define_bool CONFIG_SGI_IP22 n | ||
1695 | +define_bool CONFIG_SGI_IP27 n | ||
1696 | +define_bool CONFIG_SERIAL_MANY_PORTS n | ||
1697 | +define_bool CONFIG_MIPS_ITE8172 n | ||
1698 | +define_bool CONFIG_ARCH_CDB89712 n | ||
1699 | +define_bool CONFIG_ARCH_ARC n | ||
1700 | +define_bool CONFIG_PPC_ISERIES n | ||
1701 | +define_bool CONFIG_SA1100_CERF_CPLD n | ||
1702 | +define_bool CONFIG_SA1111 n | ||
1703 | +define_bool CONFIG_PPC_PSERIES n | ||
1704 | +define_bool CONFIG_AMIGA n | ||
1705 | +define_bool CONFIG_ARCH_FOOTBRIDGE n | ||
1706 | +define_bool CONFIG_GSC_LASI n | ||
1707 | +define_bool CONFIG_ALPHA n | ||
1708 | +define_bool CONFIG_TQM8xxL n | ||
1709 | +define_bool CONFIG_IA64_SGI_SN1 n | ||
1710 | +define_bool CONFIG_ARCH_S390 n | ||
1711 | +define_bool CONFIG_IT8712 n | ||
1712 | +define_bool CONFIG_SERIAL_EXTENDED n | ||
1713 | +define_bool CONFIG_ATARI n | ||
1714 | +define_bool CONFIG_ARCH_CLPS7500 n | ||
1715 | +define_bool CONFIG_SPARC n | ||
1716 | +define_bool CONFIG_ARCH_INTEGRATOR n | ||
1717 | +define_bool CONFIG_SUN3X n | ||
1718 | +define_bool CONFIG_ARCH_CAMELOT n | ||
1719 | +define_bool CONFIG_MIPS_IVR n | ||
1720 | +define_bool CONFIG_SH_DREAMCAST n | ||
1721 | +define_bool CONFIG_X86_64 n | ||
1722 | +define_bool CONFIG_HD64461 n | ||
1723 | +define_bool CONFIG_HD64465 n | ||
1724 | +define_bool CONFIG_TC n | ||
1725 | +define_bool CONFIG_ZORRO n | ||
1726 | +define_bool CONFIG_ARCH_CLPS711X n | ||
1727 | +define_bool CONFIG_DDB5477 n | ||
1728 | +define_bool CONFIG_Q40 n | ||
1729 | +define_bool CONFIG_ARCH_P720T n | ||
1730 | +define_bool CONFIG_DEBUG_BUGVERBOSE n | ||
1731 | +define_bool CONFIG_PARISC n | ||
1732 | +define_bool CONFIG_APOLLO n | ||
1733 | +define_bool CONFIG_FB_G364 n | ||
1734 | +define_bool CONFIG_MAC n | ||
1735 | +define_bool CONFIG_ARCH_SA1100 n | ||
1736 | +define_bool CONFIG_SA1100_CERF n | ||
1737 | +define_bool CONFIG_MIPS_JAZZ n | ||
1738 | +define_bool CONFIG_SUPERH n | ||
1739 | +define_bool CONFIG_SERIAL_SHARE_IRQ n | ||
1740 | +define_bool CONFIG_ARCH_EP7211 n | ||
1741 | +define_bool CONFIG_SPARC32 n | ||
1742 | +define_bool CONFIG_ARM n | ||
1743 | +define_bool CONFIG_SGI n | ||
1744 | +define_bool CONFIG_PPC n | ||
1745 | +define_bool CONFIG_SPARC64 n | ||
1746 | +define_bool CONFIG_FOOTBRIDGE n | ||
1747 | +define_bool CONFIG_SA1100_LART n | ||
1748 | +define_bool CONFIG_DECSTATION n | ||
1749 | +define_bool CONFIG_SERIAL_MULTIPORT n | ||
1750 | +define_bool CONFIG_MIPS_AU1000 n | ||
1751 | +define_bool CONFIG_ARCH_ACORN n | ||
1752 | +define_bool CONFIG_IA64 n | ||
1753 | +define_bool CONFIG_BAGET_MIPS n | ||
1754 | +define_bool CONFIG_IA32_EMULATION n | ||
1755 | +define_bool CONFIG_RPXCLASSIC n | ||
1756 | +define_bool CONFIG_ARCH_IQ80310 n | ||
1757 | +define_bool CONFIG_RPXLITE n | ||
1758 | +define_bool CONFIG_NINO n | ||
1759 | +define_bool CONFIG_PPC64 n | ||
1760 | +define_bool CONFIG_APUS n | ||
1761 | +define_bool CONFIG_ARCH_FTVPCI n | ||
1762 | +define_bool CONFIG_ARCH_NEXUSPCI n | ||
1763 | +define_bool CONFIG_ARCH_S390X n | ||
1764 | +define_bool CONFIG_ARCH_TBOX n | ||
1765 | +define_bool CONFIG_CARDBUS n | ||
1766 | +define_bool CONFIG_CD_NO_IDESCSI n | ||
1767 | +define_bool CONFIG_CPU_DISABLE_DCACHE n | ||
1768 | +define_bool CONFIG_DEBUG_IOVIRT n | ||
1769 | +define_bool CONFIG_EISA n | ||
1770 | +define_bool CONFIG_ETRAX100_SERIAL_FLUSH_DMA_FAST n | ||
1771 | +define_bool CONFIG_FDDI n | ||
1772 | +define_bool CONFIG_GG2 n | ||
1773 | +define_bool CONFIG_GSC_PS2 n | ||
1774 | +define_bool CONFIG_HOTPLUG n | ||
1775 | +define_bool CONFIG_IODC_CONSOLE n | ||
1776 | +define_bool CONFIG_ISA n | ||
1777 | +define_bool CONFIG_IT8172_SCR0 n | ||
1778 | +define_bool CONFIG_IT8172_SCR1 n | ||
1779 | +define_bool CONFIG_JULIETTE n | ||
1780 | +define_bool CONFIG_MCA n | ||
1781 | +define_bool CONFIG_MOUSE n | ||
1782 | +define_bool CONFIG_NETLINK n | ||
1783 | +define_bool CONFIG_NO_PGT_CACHE n | ||
1784 | +define_bool CONFIG_NUMA n | ||
1785 | +define_bool CONFIG_PCI n | ||
1786 | +define_bool CONFIG_PLD_HOTSWAP n | ||
1787 | +define_bool CONFIG_REMOTE_DEBUG n | ||
1788 | +define_bool CONFIG_SBUS n | ||
1789 | +define_bool CONFIG_SIMNOW n | ||
1790 | +define_bool CONFIG_SOFTWARE_SUSPEND n | ||
1791 | +define_bool CONFIG_TQM860 n | ||
1792 | +define_bool CONFIG_VGA_CONSOLE n | ||
1793 | +define_bool CONFIG_X86 n | ||
1794 | +define_bool CONFIG_X86_IO_APIC n | ||
1795 | +define_bool CONFIG_X86_LOCAL_APIC n | ||
1796 | +define_bool CONFIG_X86_UP_APIC n | ||
1797 | +define_bool CONFIG_X86_UP_IOAPIC n | ||
1798 | +define_bool CONFIG_XSCALE_PMU_TIMER n | ||
1799 | +define_bool CONFIG_IT8172_TUNING n | ||
1800 | +define_bool CONFIG_SA1100_CONSUS n | ||
1801 | +define_bool CONFIG_M68K n | ||
1802 | +define_bool CONFIG_PPC32 n | ||
1803 | +define_bool CONFIG_ISAPNP n | ||
1804 | +define_tristate CONFIG_PCMCIA n | ||
1805 | +define_tristate CONFIG_SERIAL n | ||
1806 | +define_tristate CONFIG_DASD_CKD n | ||
1807 | +define_tristate CONFIG_I2C n | ||
1808 | +define_tristate CONFIG_I2C_ALGOBIT n | ||
1809 | +define_tristate CONFIG_PARPORT n | ||
1810 | +define_tristate CONFIG_PPP_DEFLATE n | ||
1811 | +define_tristate CONFIG_SCSI_DEBUG n | ||
1812 | +define_tristate CONFIG_SERIAL_8250 n | ||
1813 | +define_tristate CONFIG_SONYPI n | ||
1814 | +define_tristate CONFIG_SOUND_GAMEPORT n | ||
1815 | +define_tristate CONFIG_MTD n | ||
1816 | +define_tristate CONFIG_USB n | ||
1817 | +define_tristate CONFIG_BLK_DEV_IDETAPE n | ||
1818 | +define_tristate CONFIG_AMIGAMOUSE n | ||
1819 | +define_tristate CONFIG_SCx200 n | ||
1820 | +define_tristate CONFIG_DRM_GAMMA n | ||
1821 | +define_tristate CONFIG_VIDEO_DEV n | ||
1822 | +define_tristate CONFIG_BT n | ||
1823 | +define_tristate CONFIG_BT_L2CAP n | ||
1824 | +define_tristate CONFIG_BT_SCO n | ||
1825 | +#undef | ||
1826 | +define_bool CONFIG_HIGHPTE n | ||
1827 | +define_bool CONFIG_GMAC n | ||
1828 | +define_bool CONFIG_IEEE1394_PCILYNX_LOCALRAM n | ||
1829 | +define_bool CONFIG_DRM_AGP n | ||
1830 | +define_bool CONFIG_SERIAL_DETECT_IRQ n | ||
1831 | +define_bool CONFIG_DEBUG_OBSOLETE n | ||
1832 | +define_bool CONFIG_FB_TBOX n | ||
1833 | +define_bool CONFIG_LOGITECH_3D n | ||
1834 | +define_bool CONFIG_SERIAL_ROCKETPORT n | ||
1835 | +define_bool CONFIG_MTD_INTELPROBE n | ||
1836 | +define_bool CONFIG_SERIAL_ACPI n | ||
1837 | +define_bool CONFIG_SA1100_BITSY n | ||
1838 | +define_bool CONFIG_I2C_PARPORT n | ||
1839 | +define_bool CONFIG_GAMEPORT_CS461X n | ||
1840 | +define_bool CONFIG_NET_PROFILE n | ||
1841 | +define_bool CONFIG_OBSOLETE n | ||
1842 | +define_bool CONFIG_IEEE1394_PCILYNX_PORTS n | ||
1843 | +define_bool CONFIG_MAPLE n | ||
1844 | +define_bool CONFIG_L3 n | ||
1845 | +define_bool CONFIG_SIBYTE_SB1250 n | ||
1846 | +define_bool CONFIG_SA n | ||
1847 | +define_bool CONFIG_405 n | ||
1848 | +define_bool CONFIG_AX25_DAMA_MASTER n | ||
1849 | +define_bool CONFIG_SND_DEBUG_DETECTION n | ||
1850 | +define_bool CONFIG_PCMCIA_SERIAL_CS n | ||
1851 | +define_bool CONFIG_SOUND_SND n | ||
1852 | +define_bool CONFIG_MTD_CFI_INTELSTD n | ||
1853 | +define_bool CONFIG_IT8172_REVC n | ||
1854 | +define_bool CONFIG_UM n | ||
1855 | +define_bool CONFIG_SIBYTE_SWARM n | ||
1856 | +define_bool CONFIG_S390 n | ||
1857 | +define_bool CONFIG_BLK_DEV_TIVO n | ||
1858 | +define_bool CONFIG_BRIDGE_EBT n | ||
1859 | +define_bool CONFIG_PPC_RTC n | ||
1860 | +define_bool CONFIG_GART_IOMMU n | ||
1861 | +define_bool CONFIG_ARCH_AUTCPU12 n | ||
1862 | +define_bool CONFIG_ARCH_CEIVA n | ||
1863 | +#help only | ||
1864 | +define_bool CONFIG_BLK_DEV_HD_IDE n | ||
1865 | +define_bool CONFIG_INPUT_GAMEPORT n | ||
1866 | +define_bool CONFIG_BLK_DEV_IDE_TCQ_DEFAULT n | ||
1867 | +define_bool CONFIG_BLK_DEV_ATARAID n | ||
1868 | +define_bool CONFIG_ATAPI n | ||
1869 | +define_bool CONFIG_AEC6280_BURST n | ||
1870 | +define_bool CONFIG_BLK_DEV_IDE_TCQ n | ||
1871 | +define_bool CONFIG_USB_SPEEDTCH n | ||
1872 | +define_bool CONFIG_BLK_DEV_ATARAID_PDC n | ||
1873 | +define_bool CONFIG_BLK_DEV_HD_ONLY n | ||
1874 | +define_bool CONFIG_BLK_DEV_ATARAID_HPT n | ||
1875 | +define_bool CONFIG_NFS_DIRECTIO n | ||
1876 | +define_bool CONFIG_AIC7XXX_OLD_PROC_STATS n | ||
1877 | +define_bool CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT n | ||
1878 | +define_bool CONFIG_ISDN_DIVAS_DIVA2I4L n | ||
1879 | +define_bool CONFIG_CIFS_DEBUG n | ||
1880 | +define_bool CONFIG_X86_CYCLONE n | ||
1881 | +define_bool CONFIG_SA1100_FORTUNET n | ||
1882 | +define_bool CONFIG_MTD_NAND_EDB7312 n | ||
1883 | +endmenu | ||