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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 126 Revision 127
1diff -Naurp linux-2.6.13-rc3-git4/arch/sparc/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig 1diff -Naurp linux-2.6.13-rc4-git2/arch/sparc/Kconfig linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig
2--- linux-2.6.13-rc3-git4/arch/sparc/Kconfig 2005-07-18 18:00:39.812719000 -0700 2--- linux-2.6.13-rc4-git2/arch/sparc/Kconfig 2005-07-30 19:45:56.026773134 -0700
3+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig 2005-07-24 13:35:15.368325289 -0700 3+++ linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig 2005-07-30 19:54:22.326031025 -0700
4@@ -5,15 +5,25 @@ 4@@ -5,15 +5,25 @@
5 5
6 mainmenu "Linux/SPARC Kernel Configuration" 6 mainmenu "Linux/SPARC Kernel Configuration"
7 7
8-config MMU 8-config MMU
205- bool 205- bool
206- default y 206- default y
207+source "drivers/Kconfig" 207+source "drivers/Kconfig"
208+ 208+
209+menu "Power Management Support" 209+menu "Power Management Support"
210+ 210
211-config SBUSCHAR
211+source kernel/power/Kconfig 212+source kernel/power/Kconfig
212 213+
213-config SBUSCHAR
214+config GENERIC_CALIBRATE_DELAY 214+config GENERIC_CALIBRATE_DELAY
215 bool 215 bool
216 default y 216 default y
217 217
218-config SERIAL_CONSOLE 218-config SERIAL_CONSOLE
326+ Enable HOTPLUG and KMOD, and build a modular kernel. Get agent 326+ Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
327+ software (at <http://linux-hotplug.sourceforge.net/>) and install it. 327+ software (at <http://linux-hotplug.sourceforge.net/>) and install it.
328+ Then your kernel will automatically call out to a user mode "policy 328+ Then your kernel will automatically call out to a user mode "policy
329+ agent" (/sbin/hotplug) to load modules and set up software needed 329+ agent" (/sbin/hotplug) to load modules and set up software needed
330+ to use devices as you hotplug them. 330+ to use devices as you hotplug them.
331+
332+source "drivers/pcmcia/Kconfig"
333+
334+source "drivers/pci/hotplug/Kconfig"
331 335
332- To compile the /proc/openprom support as a module, choose M here: the 336- To compile the /proc/openprom support as a module, choose M here: the
333- module will be called openpromfs. 337- module will be called openpromfs.
334+source "drivers/pcmcia/Kconfig"
335+
336+source "drivers/pci/hotplug/Kconfig"
337+
338+endmenu 338+endmenu
339 339
340- Only choose N if you know in advance that you will not need to modify 340- Only choose N if you know in advance that you will not need to modify
341- OpenPROM settings on the running system. 341- OpenPROM settings on the running system.
342+menu "Executable file formats" 342+menu "Executable file formats"
415-endmenu 415-endmenu
416- 416-
417 source "fs/Kconfig" 417 source "fs/Kconfig"
418 418
419 source "arch/sparc/Kconfig.debug" 419 source "arch/sparc/Kconfig.debug"
420@@ -333,3 +244,4 @@ source "security/Kconfig"
421 source "crypto/Kconfig"
422
423 source "lib/Kconfig"
424+
425diff -Naurp linux-2.6.13-rc3-git4/arch/sparc/Kconfig.debug linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig.debug
426--- linux-2.6.13-rc3-git4/arch/sparc/Kconfig.debug 2005-06-17 12:48:29.000000000 -0700
427+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig.debug 1969-12-31 16:00:00.000000000 -0800
428@@ -1,14 +0,0 @@
429-menu "Kernel hacking"
430-
431-source "lib/Kconfig.debug"
432-
433-config DEBUG_STACK_USAGE
434- bool "Enable stack utilization instrumentation"
435- depends on DEBUG_KERNEL
436- help
437- Enables the display of the minimum amount of free stack which each
438- task has ever had available in the sysrq-T and sysrq-P debug output.
439-
440- This option will slow down process creation somewhat.
441-
442-endmenu
443diff -Naurp linux-2.6.13-rc3-git4/arch/sparc64/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig 420diff -Naurp linux-2.6.13-rc4-git2/arch/sparc64/Kconfig linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig
444--- linux-2.6.13-rc3-git4/arch/sparc64/Kconfig 2005-07-18 18:00:39.839714000 -0700 421--- linux-2.6.13-rc4-git2/arch/sparc64/Kconfig 2005-07-30 19:45:56.029772637 -0700
445+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig 2005-07-24 13:35:15.447312335 -0700 422+++ linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig 2005-07-30 19:54:22.349027257 -0700
446@@ -5,6 +5,17 @@ 423@@ -5,6 +5,17 @@
447 424
448 mainmenu "Linux/UltraSPARC Kernel Configuration" 425 mainmenu "Linux/UltraSPARC Kernel Configuration"
449 426
450+# Identify this as a Sparc64 build 427+# Identify this as a Sparc64 build
979-source "drivers/char/watchdog/Kconfig" 956-source "drivers/char/watchdog/Kconfig"
980- 957-
981 source "arch/sparc64/oprofile/Kconfig" 958 source "arch/sparc64/oprofile/Kconfig"
982 959
983 source "arch/sparc64/Kconfig.debug" 960 source "arch/sparc64/Kconfig.debug"
984diff -Naurp linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 961diff -Naurp linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig
985--- linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig 2005-07-18 18:11:44.574247000 -0700 962--- linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig 2005-07-30 19:46:00.126092873 -0700
986+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 2005-07-24 13:40:23.591743253 -0700 963+++ linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig 2005-07-30 19:54:22.350027093 -0700
987@@ -6,15 +6,15 @@ 964@@ -6,15 +6,15 @@
988 # 965 #
989 config DRM 966 config DRM
990 tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" 967 tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
991- depends on (AGP || AGP=n) && PCI 968- depends on (AGP || AGP=n) && PCI
1001+ details. You should also select and configure AGP (/dev/agpgart) 978+ details. You should also select and configure AGP (/dev/agpgart)
1002+ support if your graphics card is connected to an AGP slot. 979+ support if your graphics card is connected to an AGP slot.
1003 980
1004 config DRM_TDFX 981 config DRM_TDFX
1005 tristate "3dfx Banshee/Voodoo3+" 982 tristate "3dfx Banshee/Voodoo3+"
983@@ -25,7 +25,7 @@ config DRM_TDFX
984
985 config DRM_GAMMA
986 tristate "3dlabs GMX 2000"
987- depends on DRM && BROKEN
988+ depends on DRM && PCI && BROKEN
989 help
990 This is the old gamma driver, please tell me if it might actually
991 work.
1006@@ -103,3 +103,11 @@ config DRM_VIA 992@@ -103,3 +103,11 @@ config DRM_VIA
1007 Choose this option if you have a Via unichrome or compatible video 993 Choose this option if you have a Via unichrome or compatible video
1008 chipset. If M is selected the module will be called via. 994 chipset. If M is selected the module will be called via.
1009 995
1010+config DRM_FFB 996+config DRM_FFB
1013+ help 999+ help
1014+ Choose this option if you have one of Sun's Creator3D-based graphics 1000+ Choose this option if you have one of Sun's Creator3D-based graphics
1015+ and frame buffer cards. Product page at 1001+ and frame buffer cards. Product page at
1016+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>. 1002+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
1017+ 1003+
1018diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 1004diff -Naurp linux-2.6.13-rc4-git2/drivers/char/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig
1019--- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-18 18:11:44.575247000 -0700 1005--- linux-2.6.13-rc4-git2/drivers/char/Kconfig 2005-07-30 19:46:00.115094698 -0700
1020+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-24 13:35:15.608285936 -0700 1006+++ linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig 2005-07-30 19:57:05.398307358 -0700
1021@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE 1007@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
1022 If you have an Alchemy AU1000 processor (MIPS based) and you want 1008 If you have an Alchemy AU1000 processor (MIPS based) and you want
1023 to use a console on a serial port, say Y. Otherwise, say N. 1009 to use a console on a serial port, say Y. Otherwise, say N.
1024 1010
1025+config SUN_AURORA 1011+config SUN_AURORA
1030+ If you have one of these, say Y. 1016+ If you have one of these, say Y.
1031+ 1017+
1032 config QTRONIX_KEYBOARD 1018 config QTRONIX_KEYBOARD
1033 bool "Enable Qtronix 990P Keyboard Support" 1019 bool "Enable Qtronix 990P Keyboard Support"
1034 depends on IT8712 1020 depends on IT8712
1035@@ -734,9 +741,20 @@ config SGI_IP27_RTC 1021@@ -733,9 +740,20 @@ config SGI_IP27_RTC
1036 via the file /proc/rtc and its behaviour is set by various ioctls on 1022 via the file /proc/rtc and its behaviour is set by various ioctls on
1037 /dev/rtc. 1023 /dev/rtc.
1038 1024
1039+config SUN_MOSTEK_RTC 1025+config SUN_MOSTEK_RTC
1040+ tristate "Mostek real time clock support" 1026+ tristate "Mostek real time clock support"
1047+ 1033+
1048+ Say Y here unless you are building a special purpose kernel. 1034+ Say Y here unless you are building a special purpose kernel.
1049+ 1035+
1050 config GEN_RTC 1036 config GEN_RTC
1051 tristate "Generic /dev/rtc emulation" 1037 tristate "Generic /dev/rtc emulation"
1052- depends on RTC!=y && !IA64 && !ARM 1038- depends on RTC!=y && !IA64 && !ARM && !PPC64
1053+ depends on RTC!=y && !IA64 && !ARM && SUN_MOSTEK_RTC!=y 1039+ depends on RTC!=y && !IA64 && !ARM && !PPC64 && SUN_MOSTEK_RTC!=y
1054 ---help--- 1040 ---help---
1055 If you say Y here and create a character special file /dev/rtc with 1041 If you say Y here and create a character special file /dev/rtc with
1056 major number 10 and minor number 135 using mknod ("man mknod"), you 1042 major number 10 and minor number 135 using mknod ("man mknod"), you
1057@@ -846,6 +864,30 @@ config TANBAC_TB0219 1043@@ -844,6 +862,30 @@ config TANBAC_TB0219
1058 tristate "TANBAC TB0219 base board support" 1044 tristate "TANBAC TB0219 base board support"
1059 depends TANBAC_TB0229 1045 depends TANBAC_TB0229
1060 1046
1061+config ENVCTRL 1047+config ENVCTRL
1062+ tristate "SUNW,envctrl support" 1048+ tristate "SUNW,envctrl support"
1083+ you should say N to this option. 1069+ you should say N to this option.
1084+ 1070+
1085 1071
1086 menu "Ftape, the floppy tape device driver" 1072 menu "Ftape, the floppy tape device driver"
1087 1073
1088diff -Naurp linux-2.6.13-rc3-git4/drivers/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig 1074diff -Naurp linux-2.6.13-rc4-git2/drivers/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig
1089--- linux-2.6.13-rc3-git4/drivers/Kconfig 2005-07-18 18:00:40.075674000 -0700 1075--- linux-2.6.13-rc4-git2/drivers/Kconfig 2005-07-30 19:45:58.456369955 -0700
1090+++ linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig 2005-07-24 13:35:15.640280688 -0700 1076+++ linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig 2005-07-30 19:54:22.352026766 -0700
1091@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig" 1077@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig"
1092 1078
1093 source "drivers/sn/Kconfig" 1079 source "drivers/sn/Kconfig"
1094 1080
1095+if SPARC32 || SPARC64 1081+if SPARC32 || SPARC64
1096+ source "drivers/fc4/Kconfig" 1082+ source "drivers/fc4/Kconfig"
1097+ source "drivers/sbus/char/Kconfig" 1083+ source "drivers/sbus/char/Kconfig"
1098+endif 1084+endif
1099+ 1085+
1100 endmenu 1086 endmenu
1101diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig 1087diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig
1102--- linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig 2005-06-17 12:48:29.000000000 -0700 1088--- linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig 2005-07-30 19:46:09.698504394 -0700
1103+++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig 2005-07-24 13:35:15.709269374 -0700 1089+++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig 2005-07-30 19:57:50.205963155 -0700
1104@@ -13,15 +13,6 @@ config SUN_OPENPROMIO 1090@@ -13,15 +13,6 @@ config SUN_OPENPROMIO
1105 1091
1106 If unsure, say Y. 1092 If unsure, say Y.
1107 1093
1108-config SUN_MOSTEK_RTC 1094-config SUN_MOSTEK_RTC
1115- Say Y here unless you are building a special purpose kernel. 1101- Say Y here unless you are building a special purpose kernel.
1116- 1102-
1117 config OBP_FLASH 1103 config OBP_FLASH
1118 tristate "OBP Flash Device support" 1104 tristate "OBP Flash Device support"
1119 depends on SPARC64 1105 depends on SPARC64
1120@@ -69,25 +60,16 @@ config SUN_JSFLASH 1106@@ -69,11 +60,5 @@ config SUN_JSFLASH
1121 If you say Y here, you will be able to boot from your JavaStation's 1107 If you say Y here, you will be able to boot from your JavaStation's
1122 Flash memory. 1108 Flash memory.
1123 1109
1124-# XXX Why don't we do "source drivers/char/Config.in" somewhere? 1110-# XXX Why don't we do "source drivers/char/Config.in" somewhere?
1125-# no shit 1111-# no shit
1126-config APM_RTC_IS_GMT
1127- bool
1128- depends on EXPERIMENTAL && SPARC32 && PCI
1129- default y
1130- help
1131- Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
1132- stores the time in GMT (Greenwich Mean Time). Say N if your RTC
1133- stores localtime.
1134-
1135- It is in fact recommended to store GMT in your RTC, because then you
1136- don't have to worry about daylight savings time changes. The only
1137- reason not to use GMT in your RTC is if you also run a broken OS
1138- that doesn't understand GMT.
1139-
1140-config RTC 1112-config RTC
1141- tristate "PC-style Real Time Clock Support" 1113- tristate "PC-style Real Time Clock Support"
1142- depends on PCI && EXPERIMENTAL && SPARC32 1114- depends on PCI && EXPERIMENTAL && SPARC32
1143+config BBC_I2C 1115-
1144+ tristate "UltraSPARC-III bootbus i2c controller driver"
1145+ depends on SPARC64 && PCI
1146+ help
1147+ The BBC devices on the UltraSPARC III have two I2C controllers. The
1148+ first I2C controller connects mainly to configuration PROMs (NVRAM,
1149+ CPU configuration, DIMM types, etc.). The second I2C controller
1150+ connects to environmental control devices such as fans and
1151+ temperature sensors. The second controller also connects to the
1152+ smartcard reader, if present. Say Y to enable support for these.
1153
1154 endmenu 1116 endmenu
1155 1117
1156diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/Makefile linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile 1118diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/Makefile linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile
1157--- linux-2.6.13-rc3-git4/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700 1119--- linux-2.6.13-rc4-git2/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700
1158+++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile 2005-07-24 13:35:15.808253141 -0700 1120+++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile 2005-07-30 19:54:22.354026438 -0700
1159@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k) 1121@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
1160 obj-y := sbus.o dvma.o 1122 obj-y := sbus.o dvma.o
1161 endif 1123 endif
1162 1124
1163-obj-$(CONFIG_SBUSCHAR) += char/ 1125-obj-$(CONFIG_SBUSCHAR) += char/
1164+obj-y += char/ 1126+obj-y += char/
1165diff -Naurp linux-2.6.13-rc3-git4/fs/Kconfig linux-2.6.13-rc3-git4-gentoo/fs/Kconfig 1127diff -Naurp linux-2.6.13-rc4-git2/fs/Kconfig linux-2.6.13-rc4-git2-gentoo/fs/Kconfig
1166--- linux-2.6.13-rc3-git4/fs/Kconfig 2005-07-18 18:00:42.781209000 -0700 1128--- linux-2.6.13-rc4-git2/fs/Kconfig 2005-07-30 19:46:15.724504429 -0700
1167+++ linux-2.6.13-rc3-git4-gentoo/fs/Kconfig 2005-07-24 13:35:15.883240843 -0700 1129+++ linux-2.6.13-rc4-git2-gentoo/fs/Kconfig 2005-07-30 19:54:22.356026110 -0700
1168@@ -856,6 +856,20 @@ config RAMFS 1130@@ -856,6 +856,20 @@ config RAMFS
1169 To compile this as a module, choose M here: the module will be called 1131 To compile this as a module, choose M here: the module will be called
1170 ramfs. 1132 ramfs.
1171 1133
1172+config SUN_OPENPROMFS 1134+config SUN_OPENPROMFS

Legend:
Removed from v.126  
changed lines
  Added in v.127

  ViewVC Help
Powered by ViewVC 1.1.20