/[linux-patches]/genpatches-2.6/trunk/2.6.13-pre/1361_sparc-kconfig-driver-rework.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.13-pre/1361_sparc-kconfig-driver-rework.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 93 - (show annotations) (download)
Wed Jul 13 12:59:32 2005 UTC (13 years, 4 months ago) by dsd
File size: 14992 byte(s)
Creating 2.6.13-pre branch from 2.6.12
1 diff -Naurp linux-2.6.12-rc4-gentoo.orig/drivers/char/Kconfig linux-2.6.12-rc4-gentoo/drivers/char/Kconfig
2 --- linux-2.6.12-rc4-gentoo.orig/drivers/char/Kconfig 2005-05-07 12:21:17.000000000 -0700
3 +++ linux-2.6.12-rc4-gentoo/drivers/char/Kconfig 2005-05-07 13:08:35.000000000 -0700
4 @@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD
5
6 config COMPUTONE
7 tristate "Computone IntelliPort Plus serial support"
8 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
9 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
10 ---help---
11 This driver supports the entire family of Intelliport II/Plus
12 controllers with the exception of the MicroChannel controllers and
13 @@ -95,7 +95,7 @@ config COMPUTONE
14
15 config ROCKETPORT
16 tristate "Comtrol RocketPort support"
17 - depends on SERIAL_NONSTANDARD
18 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
19 help
20 This driver supports Comtrol RocketPort and RocketModem PCI boards.
21 These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
22 @@ -110,7 +110,7 @@ config ROCKETPORT
23
24 config CYCLADES
25 tristate "Cyclades async mux support"
26 - depends on SERIAL_NONSTANDARD
27 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
28 ---help---
29 This driver supports Cyclades Z and Y multiserial boards.
30 You would need something like this to connect more than two modems to
31 @@ -138,7 +138,7 @@ config CYZ_INTR
32
33 config DIGIEPCA
34 tristate "Digiboard Intelligent Async Support"
35 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
36 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
37 ---help---
38 This is a driver for Digi International's Xx, Xeve, and Xem series
39 of cards which provide multiple serial ports. You would need
40 @@ -166,7 +166,7 @@ config ESPSERIAL
41
42 config MOXA_INTELLIO
43 tristate "Moxa Intellio support"
44 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
45 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
46 help
47 Say Y here if you have a Moxa Intellio multiport serial card.
48
49 @@ -175,7 +175,7 @@ config MOXA_INTELLIO
50
51 config MOXA_SMARTIO
52 tristate "Moxa SmartIO support"
53 - depends on SERIAL_NONSTANDARD
54 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
55 help
56 Say Y here if you have a Moxa SmartIO multiport serial card.
57
58 @@ -208,7 +208,7 @@ config SYNCLINK
59
60 config SYNCLINKMP
61 tristate "SyncLink Multiport support"
62 - depends on SERIAL_NONSTANDARD
63 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
64 help
65 Enable support for the SyncLink Multiport (2 or 4 ports)
66 serial adapter, running asynchronous and HDLC communications up
67 @@ -234,7 +234,7 @@ config N_HDLC
68
69 config RISCOM8
70 tristate "SDL RISCom/8 card support"
71 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
72 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
73 help
74 This is a driver for the SDL Communications RISCom/8 multiport card,
75 which gives you many serial ports. You would need something like
76 @@ -247,7 +247,7 @@ config RISCOM8
77
78 config SPECIALIX
79 tristate "Specialix IO8+ card support"
80 - depends on SERIAL_NONSTANDARD
81 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
82 help
83 This is a driver for the Specialix IO8+ multiport card (both the
84 ISA and the PCI version) which gives you many serial ports. You
85 @@ -271,7 +271,7 @@ config SPECIALIX_RTSCTS
86
87 config SX
88 tristate "Specialix SX (and SI) card support"
89 - depends on SERIAL_NONSTANDARD
90 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
91 help
92 This is a driver for the SX and SI multiport serial cards.
93 Please read the file <file:Documentation/sx.txt> for details.
94 @@ -282,7 +282,7 @@ config SX
95
96 config RIO
97 tristate "Specialix RIO system support"
98 - depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
99 + depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA)
100 help
101 This is a driver for the Specialix RIO, a smart serial card which
102 drives an outboard box that can support up to 128 ports. Product
103 @@ -291,7 +291,7 @@ config RIO
104
105 config RIO_OLDPCI
106 bool "Support really old RIO/PCI cards"
107 - depends on RIO
108 + depends on RIO && PCI
109 help
110 Older RIO PCI cards need some initialization-time configuration to
111 determine the IRQ and some control addresses. If you have a RIO and
112 @@ -299,7 +299,7 @@ config RIO_OLDPCI
113
114 config STALDRV
115 bool "Stallion multiport serial support"
116 - depends on SERIAL_NONSTANDARD
117 + depends on SERIAL_NONSTANDARD && (PCI || ISA)
118 help
119 Stallion cards give you many serial ports. You would need something
120 like this to connect more than two modems to your Linux box, for
121 @@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
122 If you have an Alchemy AU1000 processor (MIPS based) and you want
123 to use a console on a serial port, say Y. Otherwise, say N.
124
125 +config SUN_AURORA
126 + tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"
127 + depends on SERIAL_NONSTANDARD && EXPERIMENTAL && SBUS && !SUN4
128 + help
129 + The Aurora Multiboard is a multi-port high-speed serial controller.
130 + If you have one of these, say Y.
131 +
132 config QTRONIX_KEYBOARD
133 bool "Enable Qtronix 990P Keyboard Support"
134 depends on IT8712
135 @@ -687,7 +694,8 @@ config NVRAM
136
137 config RTC
138 tristate "Enhanced Real Time Clock Support"
139 - depends on !PPC32 && !PARISC && !IA64 && !M68K
140 + depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC32 || PCI) && (!SPARC64 || PCI)
141 + default y if SPARC64
142 ---help---
143 If you say Y here and create a character special file /dev/rtc with
144 major number 10 and minor number 135 using mknod ("man mknod"), you
145 @@ -733,9 +741,20 @@ config SGI_IP27_RTC
146 via the file /proc/rtc and its behaviour is set by various ioctls on
147 /dev/rtc.
148
149 +config SUN_MOSTEK_RTC
150 + tristate "Mostek real time clock support"
151 + depends on (SPARC32 || SPARC64)
152 + default y
153 + help
154 + The Mostek RTC chip is used on all known Sun computers except
155 + some JavaStations. For a JavaStation you need to say Y both here
156 + and to "Enhanced Real Time Clock Support".
157 +
158 + Say Y here unless you are building a special purpose kernel.
159 +
160 config GEN_RTC
161 tristate "Generic /dev/rtc emulation"
162 - depends on RTC!=y && !IA64 && !ARM
163 + depends on RTC!=y && !IA64 && !ARM && SUN_MOSTEK_RTC!=y
164 ---help---
165 If you say Y here and create a character special file /dev/rtc with
166 major number 10 and minor number 135 using mknod ("man mknod"), you
167 @@ -792,6 +811,7 @@ config COBALT_LCD
168
169 config DTLK
170 tristate "Double Talk PC internal speech card support"
171 + depends on ISA
172 help
173 This driver is for the DoubleTalk PC, a speech synthesizer
174 manufactured by RC Systems (<http://www.rcsys.com/>). It is also
175 @@ -844,6 +864,30 @@ config TANBAC_TB0219
176 tristate "TANBAC TB0219 base board support"
177 depends TANBAC_TB0229
178
179 +config ENVCTRL
180 + tristate "SUNW,envctrl support"
181 + depends on PCI && SPARC64
182 + help
183 + Kernel support for temperature and fan monitoring on Sun SME
184 + machines.
185 +
186 + To compile this driver as a module, choose M here: the
187 + module will be called envctrl.
188 +
189 +config DISPLAY7SEG
190 + tristate "Sun CPCI 7-Segment Display support"
191 + depends on PCI && SPARC64
192 + ---help---
193 + This is the driver for the 7-segment display and LED present on
194 + Sun Microsystems CompactPCI models CP1400 and CP1500.
195 +
196 + To compile this driver as a module, choose M here: the
197 + module will be called display7seg.
198 +
199 + If you do not have a CompactPCI model CP1400 or CP1500, or
200 + another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
201 + you should say N to this option.
202 +
203
204 menu "Ftape, the floppy tape device driver"
205
206 diff -Naurp linux-2.6.12-rc4-gentoo.orig/drivers/char/agp/Kconfig linux-2.6.12-rc4-gentoo/drivers/char/agp/Kconfig
207 --- linux-2.6.12-rc4-gentoo.orig/drivers/char/agp/Kconfig 2005-05-07 12:21:17.000000000 -0700
208 +++ linux-2.6.12-rc4-gentoo/drivers/char/agp/Kconfig 2005-05-07 13:08:47.000000000 -0700
209 @@ -2,6 +2,7 @@ config AGP
210 tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
211 depends on ALPHA || IA64 || PPC || X86
212 default y if GART_IOMMU
213 + depends on PCI
214 ---help---
215 AGP (Accelerated Graphics Port) is a bus system mainly used to
216 connect graphics cards to the rest of the system.
217 diff -Naurp linux-2.6.12-rc4-gentoo.orig/drivers/char/drm/Kconfig linux-2.6.12-rc4-gentoo/drivers/char/drm/Kconfig
218 --- linux-2.6.12-rc4-gentoo.orig/drivers/char/drm/Kconfig 2005-05-07 12:21:17.000000000 -0700
219 +++ linux-2.6.12-rc4-gentoo/drivers/char/drm/Kconfig 2005-05-07 13:08:47.000000000 -0700
220 @@ -25,7 +25,7 @@ config DRM_TDFX
221
222 config DRM_GAMMA
223 tristate "3dlabs GMX 2000"
224 - depends on DRM && BROKEN
225 + depends on DRM && PCI && BROKEN
226 help
227 This is the old gamma driver, please tell me if it might actually
228 work.
229 @@ -96,3 +96,11 @@ config DRM_SIS
230 chipset. If M is selected the module will be called sis. AGP
231 support is required for this driver to work.
232
233 +config DRM_FFB
234 + tristate "Creator/Creator3D"
235 + depends on DRM && SPARC64
236 + help
237 + Choose this option if you have one of Sun's Creator3D-based graphics
238 + and frame buffer cards. Product page at
239 + <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
240 +
241 diff -Naurp linux-2.6.12-rc4-gentoo.orig/drivers/sbus/Makefile linux-2.6.12-rc4-gentoo/drivers/sbus/Makefile
242 --- linux-2.6.12-rc4-gentoo.orig/drivers/sbus/Makefile 2005-03-01 23:38:26.000000000 -0800
243 +++ linux-2.6.12-rc4-gentoo/drivers/sbus/Makefile 2005-05-07 13:08:47.000000000 -0700
244 @@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
245 obj-y := sbus.o dvma.o
246 endif
247
248 -obj-$(CONFIG_SBUSCHAR) += char/
249 +obj-y += char/
250 diff -Naurp linux-2.6.12-rc4-gentoo.orig/drivers/sbus/char/Kconfig linux-2.6.12-rc4-gentoo/drivers/sbus/char/Kconfig
251 --- linux-2.6.12-rc4-gentoo.orig/drivers/sbus/char/Kconfig 2005-03-01 23:38:26.000000000 -0800
252 +++ linux-2.6.12-rc4-gentoo/drivers/sbus/char/Kconfig 2005-05-07 13:08:47.000000000 -0700
253 @@ -13,15 +13,6 @@ config SUN_OPENPROMIO
254
255 If unsure, say Y.
256
257 -config SUN_MOSTEK_RTC
258 - tristate "Mostek real time clock support"
259 - help
260 - The Mostek RTC chip is used on all known Sun computers except
261 - some JavaStations. For a JavaStation you need to say Y both here
262 - and to "Enhanced Real Time Clock Support".
263 -
264 - Say Y here unless you are building a special purpose kernel.
265 -
266 config OBP_FLASH
267 tristate "OBP Flash Device support"
268 depends on SPARC64
269 @@ -69,25 +60,16 @@ config SUN_JSFLASH
270 If you say Y here, you will be able to boot from your JavaStation's
271 Flash memory.
272
273 -# XXX Why don't we do "source drivers/char/Config.in" somewhere?
274 -# no shit
275 -config APM_RTC_IS_GMT
276 - bool
277 - depends on EXPERIMENTAL && SPARC32 && PCI
278 - default y
279 - help
280 - Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
281 - stores the time in GMT (Greenwich Mean Time). Say N if your RTC
282 - stores localtime.
283 -
284 - It is in fact recommended to store GMT in your RTC, because then you
285 - don't have to worry about daylight savings time changes. The only
286 - reason not to use GMT in your RTC is if you also run a broken OS
287 - that doesn't understand GMT.
288 -
289 -config RTC
290 - tristate "PC-style Real Time Clock Support"
291 - depends on PCI && EXPERIMENTAL && SPARC32
292 +config BBC_I2C
293 + tristate "UltraSPARC-III bootbus i2c controller driver"
294 + depends on SPARC64 && PCI
295 + help
296 + The BBC devices on the UltraSPARC III have two I2C controllers. The
297 + first I2C controller connects mainly to configuration PROMs (NVRAM,
298 + CPU configuration, DIMM types, etc.). The second I2C controller
299 + connects to environmental control devices such as fans and
300 + temperature sensors. The second controller also connects to the
301 + smartcard reader, if present. Say Y to enable support for these.
302
303 endmenu
304
305 diff -Naurp linux-2.6.12-rc4-gentoo.orig/drivers/video/Kconfig linux-2.6.12-rc4-gentoo/drivers/video/Kconfig
306 --- linux-2.6.12-rc4-gentoo.orig/drivers/video/Kconfig 2005-05-07 12:21:47.000000000 -0700
307 +++ linux-2.6.12-rc4-gentoo/drivers/video/Kconfig 2005-05-07 13:08:48.000000000 -0700
308 @@ -561,35 +561,6 @@ config FB_SUN3
309 bool "Sun3 framebuffer support"
310 depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
311
312 -config FB_BW2
313 - bool "BWtwo support"
314 - depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
315 - select FB_CFB_FILLRECT
316 - select FB_CFB_COPYAREA
317 - select FB_CFB_IMAGEBLIT
318 - select FB_SOFT_CURSOR
319 - help
320 - This is the frame buffer device driver for the BWtwo frame buffer.
321 -
322 -config FB_CG3
323 - bool "CGthree support"
324 - depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
325 - select FB_CFB_COPYAREA
326 - select FB_CFB_IMAGEBLIT
327 - select FB_SOFT_CURSOR
328 - help
329 - This is the frame buffer device driver for the CGthree frame buffer.
330 -
331 -config FB_CG6
332 - bool "CGsix (GX,TurboGX) support"
333 - depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
334 - select FB_CFB_COPYAREA
335 - select FB_CFB_IMAGEBLIT
336 - select FB_SOFT_CURSOR
337 - help
338 - This is the frame buffer device driver for the CGsix (GX, TurboGX)
339 - frame buffer.
340 -
341 config FB_PVR2
342 tristate "NEC PowerVR 2 display support"
343 depends on FB && SH_DREAMCAST
344 @@ -1253,6 +1224,35 @@ config FB_FFB
345 This is the frame buffer device driver for the Creator, Creator3D,
346 and Elite3D graphics boards.
347
348 +config FB_BW2
349 + bool "BWtwo support"
350 + depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
351 + select FB_CFB_FILLRECT
352 + select FB_CFB_COPYAREA
353 + select FB_CFB_IMAGEBLIT
354 + select FB_SOFT_CURSOR
355 + help
356 + This is the frame buffer device driver for the BWtwo frame buffer.
357 +
358 +config FB_CG3
359 + bool "CGthree support"
360 + depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
361 + select FB_CFB_COPYAREA
362 + select FB_CFB_IMAGEBLIT
363 + select FB_SOFT_CURSOR
364 + help
365 + This is the frame buffer device driver for the CGthree frame buffer.
366 +
367 +config FB_CG6
368 + bool "CGsix (GX,TurboGX) support"
369 + depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
370 + select FB_CFB_COPYAREA
371 + select FB_CFB_IMAGEBLIT
372 + select FB_SOFT_CURSOR
373 + help
374 + This is the frame buffer device driver for the CGsix (GX, TurboGX)
375 + frame buffer.
376 +
377 config FB_TCX
378 bool "TCX (SS4/SS5 only) support"
379 depends on FB_SBUS
380 diff -Naurp linux-2.6.12-rc4-gentoo.orig/fs/Kconfig linux-2.6.12-rc4-gentoo/fs/Kconfig
381 --- linux-2.6.12-rc4-gentoo.orig/fs/Kconfig 2005-05-07 12:21:50.000000000 -0700
382 +++ linux-2.6.12-rc4-gentoo/fs/Kconfig 2005-05-07 13:08:48.000000000 -0700
383 @@ -867,6 +867,20 @@ config RAMFS
384 To compile this as a module, choose M here: the module will be called
385 ramfs.
386
387 +config SUN_OPENPROMFS
388 + depends on SPARC32 || SPARC64
389 + tristate "OpenPROM file system"
390 + help
391 + If you say Y, the OpenPROM device tree will be available as a
392 + virtual file system, which you can mount to /proc/openprom by "mount
393 + -t openpromfs none /proc/openprom".
394 +
395 + To compile the /proc/openprom support as a module, choose M here: the
396 + module will be called openpromfs.
397 +
398 + Only choose N if you know in advance that you will not need to modify
399 + OpenPROM settings on the running system.
400 +
401 endmenu
402
403 menu "Miscellaneous filesystems"

  ViewVC Help
Powered by ViewVC 1.1.20