[oe-commits] org.oe.dev conf/distro/openomap.conf

[crofton commit]

conf/distro/openomap.conf
conf/machine/omap5912osk.conf
packages/linux/linux-omap1-2.6.18+git/defconfig
  * Add alsa support to openomap distro on the omap5912osk.
  * Modify linux-omap1-2.6.18+git defconfig to include alsa driver

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 8e1a164c9cffd14dc921791a54888fe4dfde1cff
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8e1a164c9cffd14dc921791a54888fe4dfde1cff
Files:
1
conf/distro/openomap.conf
conf/machine/omap5912osk.conf
packages/linux/linux-omap1-2.6.18+git/defconfig
Diffs:

#
# mt diff -r2ba6381f23f0b0282c3a4b62fa71c823fb50003f -r8e1a164c9cffd14dc921791a54888fe4dfde1cff
#
# 
# 
# patch "conf/distro/openomap.conf"
#  from [04f958d0fd0715021490b88d9dd8512f69d4280d]
#    to [41be6908a87ae96052fac8bf5c129b3a414de3a5]
# 
# patch "conf/machine/omap5912osk.conf"
#  from [12ce196961e8bb508a156d26f62fc116a4953fc2]
#    to [be5ff17b9dbc53ae9a474e4cc4d5e800f38cb5b7]
# 
# patch "packages/linux/linux-omap1-2.6.18+git/defconfig"
#  from [4510f333d139b87ed9d65ede2c3c680ad5d215bc]
#    to [68fd2941c7d47259256a8f6048dcfa373bac796b]
# 
============================================================
--- conf/distro/openomap.conf	04f958d0fd0715021490b88d9dd8512f69d4280d
+++ conf/distro/openomap.conf	41be6908a87ae96052fac8bf5c129b3a414de3a5
@@ -45,7 +45,7 @@ PREFERRED_VERSION_glibc-intermediate ?= 
 #PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs pcmcia usbhost"
+DISTRO_FEATURES = "nfs pcmcia usbhost alsa"
 
 PCMCIA_MANAGER = "pcmciautils"
 
============================================================
--- conf/machine/omap5912osk.conf	12ce196961e8bb508a156d26f62fc116a4953fc2
+++ conf/machine/omap5912osk.conf	be5ff17b9dbc53ae9a474e4cc4d5e800f38cb5b7
@@ -16,7 +16,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-e
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-MACHINE_FEATURES = "kernel26 pcmcia usbhost"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
 MACHINE_TASK_PROVIDER = "task-base"
 
============================================================
--- packages/linux/linux-omap1-2.6.18+git/defconfig	4510f333d139b87ed9d65ede2c3c680ad5d215bc
+++ packages/linux/linux-omap1-2.6.18+git/defconfig	68fd2941c7d47259256a8f6048dcfa373bac796b
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.18-omap1
-# Fri Oct 20 12:49:51 2006
+# Fri Oct 20 16:31:35 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -740,7 +740,7 @@ CONFIG_TPS65010=y
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_ISP1301_OMAP is not set
 CONFIG_TPS65010=y
-# CONFIG_SENSORS_TLV320AIC23 is not set
+CONFIG_SENSORS_TLV320AIC23=y
 # CONFIG_GPIOEXPANDER_OMAP is not set
 # CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
@@ -882,9 +882,57 @@ CONFIG_LOGO_LINUX_CLUT224=y
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
 
 #
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_OMAP_AIC23=y
+# CONFIG_SND_OMAP_TSC2101 is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y