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

3 files changed, 53 insertions, 5 deletions

diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index 88a5f06b50..0c864db04f 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -45,7 +45,7 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 #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"
 
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index f7371dec18..c6bb20948a 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -16,7 +16,7 @@ PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020"
 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"
 
diff --git a/packages/linux/linux-omap1-2.6.18+git/defconfig b/packages/linux/linux-omap1-2.6.18+git/defconfig
index 0fde108d93..7906b901ea 100644
--- a/packages/linux/linux-omap1-2.6.18+git/defconfig
+++ b/packages/linux/linux-omap1-2.6.18+git/defconfig
@@ -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_I2C_OMAP=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,7 +882,55 @@ 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