r1213 - in trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27: config/mips config/mipsel debian debian/patches

Wed, 18 Aug 2004 08:57:46 -0600

Author: ths-guest
Date: 2004-08-18 08:57:40 -0600 (Wed, 18 Aug 2004)
New Revision: 1213

Modified:
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list
Log:
Fix missing RTC support for SWARM. Add sound/usb/firewire modules for cobalt.


Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn
===================================================================

--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn	2004-08-18 07:49:56 UTC (rev 1212)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn	2004-08-18 14:57:40 UTC (rev 1213)
@@ -89,6 +89,7 @@
 # CONFIG_SIBYTE_TBPROF is not set
 CONFIG_SIBYTE_GENBUS_IDE=y
 CONFIG_SMP_CAPABLE=y
+CONFIG_MIPS_RTC=y
 # CONFIG_SNI_RM200_PCI is not set
 # CONFIG_TANBAC_TB0226 is not set
 # CONFIG_TANBAC_TB0229 is not set

Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt	2004-08-18 07:49:56 UTC (rev 1212)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt	2004-08-18 14:57:40 UTC (rev 1213)
@@ -471,9 +471,31 @@
 #
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
-# CONFIG_IEEE1394 is not set
+CONFIG_IEEE1394=m
 
 #
+# Device Drivers
+#
+
+#
+#   Texas Instruments PCILynx requires I2C bit-banging
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+# CONFIG_IEEE1394_SBP2 is not set
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+
+#
 # I2O device support
 #
 # CONFIG_I2O is not set
@@ -861,14 +883,176 @@
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_ALI5455=m
+CONFIG_SOUND_ALI5455_CODECSPDIFOUT_PCMOUTSHARE=y
+CONFIG_SOUND_ALI5455_CODECSPDIFOUT_CODECINDEPENDENTDMA=y
+CONFIG_SOUND_ALI5455_CONTROLLERSPDIFOUT_PCMOUTSHARE=y
+CONFIG_SOUND_ALI5455_CONTROLLERSPDIFOUT_CONTROLLERINDEPENDENTDMA=y
+CONFIG_SOUND_BT878=m
+CONFIG_SOUND_CMPCI=m
+# CONFIG_SOUND_CMPCI_FM is not set
+# CONFIG_SOUND_CMPCI_MIDI is not set
+# CONFIG_SOUND_CMPCI_JOYSTICK is not set
+# CONFIG_SOUND_CMPCI_CM8738 is not set
+CONFIG_SOUND_EMU10K1=m
+CONFIG_MIDI_EMU10K1=y
+CONFIG_SOUND_FUSION=m
+CONFIG_SOUND_CS4281=m
+CONFIG_SOUND_ES1370=m
+CONFIG_SOUND_ES1371=m
+CONFIG_SOUND_ESSSOLO1=m
+CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
+CONFIG_SOUND_FORTE=m
+# CONFIG_SOUND_ICH is not set
+CONFIG_SOUND_RME96XX=m
+CONFIG_SOUND_SONICVIBES=m
+CONFIG_SOUND_TRIDENT=m
+CONFIG_SOUND_MSNDCLAS=m
+# CONFIG_MSNDCLAS_HAVE_BOOT is not set
+CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
+CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
+CONFIG_SOUND_MSNDPIN=m
+# CONFIG_MSNDPIN_HAVE_BOOT is not set
+CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
+CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+# CONFIG_SOUND_VIA82CXXX is not set
+# CONFIG_MIDI_VIA82CXXX is not set
+# CONFIG_SOUND_OSS is not set
+# CONFIG_SOUND_TVMIXER is not set
+CONFIG_SOUND_AD1980=m
+CONFIG_SOUND_WM97XX=m
 
 #
 # USB support
 #
-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
 
 #
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_AUDIO=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_MIDI=m
+
+#
+#   SCSI support is needed for USB Storage
+#
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# USB Human Interface Devices (HID)
+#
+# CONFIG_USB_HID is not set
+
+#
+#     Input core support is needed for USB HID input layer or HIDBP support
+#
+# CONFIG_USB_HIDINPUT is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_CATC=m
+CONFIG_USB_CDCETHER=m
+CONFIG_USB_USBNET=m
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_OMNINET=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_RIO500=m
+CONFIG_USB_AUERSWALD=m
+CONFIG_USB_TIGL=m
+CONFIG_USB_BRLVGER=m
+CONFIG_USB_LCD=m
+
+#
 # Support for USB gadgets
 #
 # CONFIG_USB_GADGET is not set

Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn	2004-08-18 07:49:56 UTC (rev 1212)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn	2004-08-18 14:57:40 UTC (rev 1213)
@@ -89,6 +89,7 @@
 # CONFIG_SIBYTE_TBPROF is not set
 CONFIG_SIBYTE_GENBUS_IDE=y
 CONFIG_SMP_CAPABLE=y
+CONFIG_MIPS_RTC=y
 # CONFIG_SNI_RM200_PCI is not set
 # CONFIG_TANBAC_TB0226 is not set
 # CONFIG_TANBAC_TB0229 is not set

Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog	2004-08-18 07:49:56 UTC (rev 1212)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog	2004-08-18 14:57:40 UTC (rev 1213)
@@ -6,8 +6,9 @@
   * Remove 01_export-objs.dpatch, 02_addinitrd-cleanup.dpatch,
     20_swarm-TIOCGSERIAL.dpatch , 23_swarm-highmem-tlb.dpatch
     and 41_ip22-ipv6.dpatch, they went in upstream.
-  * Update kernel configs.
+  * Update kernel configs. Add sound/usb/firewire modules for r5k-cobalt.
   * Add patch for xxs1500 board_reset function, 50_xxs1500-boardreset.dpatch.
+  * Add patch for SWARM to enable MIPS_RTC again, 20_sb1-mipsrtc.dpatch.
 
  -- Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>  Sun, 15 Aug 2004 17:07:15 +0200
 

Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list	2004-08-18 07:49:56 UTC (rev 1212)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00list	2004-08-18 14:57:40 UTC (rev 1213)
@@ -3,6 +3,7 @@
 04_ramdisk-parameter.dpatch
 05_linux-mips-makefile.dpatch
 10_cobalt-patch.dpatch
+20_sb1-mipsrtc.dpatch
 21_sb-duart.dpatch
 22_swarm-pcmcia.dpatch
 30_dec-initrd.dpatch



