Sun Dec 28 15:18:21 2008 UTC ()
PR# port-i386/40284: add AMD Geode CS5536 audio driver; add gcscaudio(4)
to i386 GENERIC and ALL kernels


(jmcneill)
diff -r1.186 -r1.187 src/sys/arch/i386/conf/ALL
diff -r1.921 -r1.922 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.186 -r1.187 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2008/12/14 00:44:29 1.186
+++ src/sys/arch/i386/conf/ALL 2008/12/28 15:18:21 1.187
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.186 2008/12/14 00:44:29 jmcneill Exp $ 1# $NetBSD: ALL,v 1.187 2008/12/28 15:18:21 jmcneill Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.186 $" 20#ident "ALL-$Revision: 1.187 $"
21 21
22maxusers 32 # estimated number of users 22maxusers 32 # estimated number of users
23 23
24# CPU-related options. 24# CPU-related options.
25options VM86 # virtual 8086 emulation 25options VM86 # virtual 8086 emulation
26options USER_LDT # user-settable LDT; used by WINE 26options USER_LDT # user-settable LDT; used by WINE
27 27
28# Enhanced SpeedStep Technology in the Pentium M 28# Enhanced SpeedStep Technology in the Pentium M
29options ENHANCED_SPEEDSTEP 29options ENHANCED_SPEEDSTEP
30options EST_FREQ_USERWRITE # any user can set frequency 30options EST_FREQ_USERWRITE # any user can set frequency
31 31
32# AMD PowerNow! K7 32# AMD PowerNow! K7
33options POWERNOW_K7 33options POWERNOW_K7
@@ -1258,26 +1258,27 @@ auich* at pci? dev ? function ? # Intel  @@ -1258,26 +1258,27 @@ auich* at pci? dev ? function ? # Intel
1258auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio 1258auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
1259autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio 1259autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
1260auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio 1260auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
1261azalia* at pci? dev ? function ? # High Definition Audio 1261azalia* at pci? dev ? function ? # High Definition Audio
1262clcs* at pci? dev ? function ? # Cirrus Logic CS4280 1262clcs* at pci? dev ? function ? # Cirrus Logic CS4280
1263clct* at pci? dev ? function ? # Cirrus Logic CS4281 1263clct* at pci? dev ? function ? # Cirrus Logic CS4281
1264cmpci* at pci? dev ? function ? # C-Media CMI8338/8738 1264cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
1265eap* at pci? dev ? function ? # Ensoniq AudioPCI 1265eap* at pci? dev ? function ? # Ensoniq AudioPCI
1266emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512 1266emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
1267esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio 1267esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
1268esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator 1268esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
1269eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive 1269eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
1270fms* at pci? dev ? function ? # Forte Media FM801 1270fms* at pci? dev ? function ? # Forte Media FM801
 1271gcscaudio* at pci? dev ? function ? # AMD Geode CS5536 Companion Audio
1271neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio 1272neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
1272sv* at pci? dev ? function ? # S3 SonicVibes 1273sv* at pci? dev ? function ? # S3 SonicVibes
1273yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio 1274yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
1274 1275
1275# ISA Plug-and-Play audio devices 1276# ISA Plug-and-Play audio devices
1276ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio 1277ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
1277guspnp* at isapnp? # Gravis Ultra Sound PnP audio 1278guspnp* at isapnp? # Gravis Ultra Sound PnP audio
1278sb* at isapnp? # SoundBlaster-compatible audio 1279sb* at isapnp? # SoundBlaster-compatible audio
1279wss* at isapnp? # Windows Sound System 1280wss* at isapnp? # Windows Sound System
1280ym* at isapnp? # Yamaha OPL3-SA[23] audio 1281ym* at isapnp? # Yamaha OPL3-SA[23] audio
1281 1282
1282# ISA audio devices 1283# ISA audio devices
1283# the "aria" probe might give false hits 1284# the "aria" probe might give false hits
cvs diff -r1.921 -r1.922 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2008/12/14 00:44:29 1.921
+++ src/sys/arch/i386/conf/GENERIC 2008/12/28 15:18:21 1.922
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.921 2008/12/14 00:44:29 jmcneill Exp $ 1# $NetBSD: GENERIC,v 1.922 2008/12/28 15:18:21 jmcneill Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.921 $" 25#ident "GENERIC-$Revision: 1.922 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, 29makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
30 # tune for more modern 30 # tune for more modern
31 31
32# For GENERIC, we build the exec formats as modules by default. 32# For GENERIC, we build the exec formats as modules by default.
33no options EXEC_AOUT # exec a.out binaries 33no options EXEC_AOUT # exec a.out binaries
34no options EXEC_ELF32 # exec ELF binaries 34no options EXEC_ELF32 # exec ELF binaries
35no options EXEC_SCRIPT # exec #! scripts 35no options EXEC_SCRIPT # exec #! scripts
36no options COREDUMP 36no options COREDUMP
37 37
38# CPU-related options. 38# CPU-related options.
@@ -1254,26 +1254,27 @@ auich* at pci? dev ? function ? # Intel  @@ -1254,26 +1254,27 @@ auich* at pci? dev ? function ? # Intel
1254auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio 1254auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
1255autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio 1255autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
1256auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio 1256auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
1257azalia* at pci? dev ? function ? # High Definition Audio 1257azalia* at pci? dev ? function ? # High Definition Audio
1258clcs* at pci? dev ? function ? # Cirrus Logic CS4280 1258clcs* at pci? dev ? function ? # Cirrus Logic CS4280
1259clct* at pci? dev ? function ? # Cirrus Logic CS4281 1259clct* at pci? dev ? function ? # Cirrus Logic CS4281
1260cmpci* at pci? dev ? function ? # C-Media CMI8338/8738 1260cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
1261eap* at pci? dev ? function ? # Ensoniq AudioPCI 1261eap* at pci? dev ? function ? # Ensoniq AudioPCI
1262emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512 1262emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
1263esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio 1263esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
1264esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator 1264esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
1265eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive 1265eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
1266fms* at pci? dev ? function ? # Forte Media FM801 1266fms* at pci? dev ? function ? # Forte Media FM801
 1267gcscaudio* at pci? dev ? function ? # AMD Geode CS5536 Companion Audio
1267neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio 1268neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
1268sv* at pci? dev ? function ? # S3 SonicVibes 1269sv* at pci? dev ? function ? # S3 SonicVibes
1269yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio 1270yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
1270 1271
1271# ISA Plug-and-Play audio devices 1272# ISA Plug-and-Play audio devices
1272ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio 1273ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
1273guspnp* at isapnp? # Gravis Ultra Sound PnP audio 1274guspnp* at isapnp? # Gravis Ultra Sound PnP audio
1274sb* at isapnp? # SoundBlaster-compatible audio 1275sb* at isapnp? # SoundBlaster-compatible audio
1275wss* at isapnp? # Windows Sound System 1276wss* at isapnp? # Windows Sound System
1276ym* at isapnp? # Yamaha OPL3-SA[23] audio 1277ym* at isapnp? # Yamaha OPL3-SA[23] audio
1277 1278
1278# ISA audio devices 1279# ISA audio devices
1279# the "aria" probe might give false hits 1280# the "aria" probe might give false hits