package/zlib: update to zlib-1.2.5

[openwrt.git] / package / kernel / modules / sound.mk

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 5146bf4..8c0ce65 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -1,17 +1,31 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 SOUND_MENU:=Sound Support
 
 
 SOUND_MENU:=Sound Support
 

+define KernelPackage/pcspkr
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=PC speaker support
+  KCONFIG:=CONFIG_INPUT_PCSPKR
+  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko
+  AUTOLOAD:=$(call AutoLoad,50,pcspkr)
+endef
+
+define KernelPackage/pcspkr/description
+ This enables sounds (tones) through the pc speaker
+endef
+
+$(eval $(call KernelPackage,pcspkr))
+
+

 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support

-  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
+  DEPENDS:=@AUDIO_SUPPORT

   KCONFIG:= \
        CONFIG_SOUND \
        CONFIG_SND \
   KCONFIG:= \
        CONFIG_SOUND \
        CONFIG_SND \


@@ -25,11 +39,13 @@ define KernelPackage/sound-core
        CONFIG_SND_SEQUENCER_OSS=y \
        CONFIG_HOSTAUDIO \
        CONFIG_SND_PCM_OSS \
        CONFIG_SND_SEQUENCER_OSS=y \
        CONFIG_HOSTAUDIO \
        CONFIG_SND_PCM_OSS \

-       CONFIG_SND_MIXER_OSS
+       CONFIG_SND_MIXER_OSS \
+       CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+  $(call AddDepends/input)

 endef
 
 define KernelPackage/sound-core/2.4
 endef
 
 define KernelPackage/sound-core/2.4

-  FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/sound/soundcore.ko

   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 


@@ -47,26 +63,26 @@ SOUNDCORE_LOAD ?= \
        snd-pcm-oss
 
 SOUNDCORE_FILES ?= \
        snd-pcm-oss
 
 SOUNDCORE_FILES ?= \

-       $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/seq/snd-seq-device.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/sound/soundcore.ko \
+       $(LINUX_DIR)/sound/core/snd.ko \
+       $(LINUX_DIR)/sound/core/snd-page-alloc.ko \
+       $(LINUX_DIR)/sound/core/snd-hwdep.ko \
+       $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko \
+       $(LINUX_DIR)/sound/core/snd-rawmidi.ko \
+       $(LINUX_DIR)/sound/core/snd-timer.ko \
+       $(LINUX_DIR)/sound/core/snd-pcm.ko \
+       $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
+       $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko

 
 define KernelPackage/sound-core/2.6
   FILES:=$(SOUNDCORE_FILES)
   AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
 endef
 
 
 define KernelPackage/sound-core/2.6
   FILES:=$(SOUNDCORE_FILES)
   AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
 endef
 

-define KernelPackage/sound-core/uml-2.6
+define KernelPackage/sound-core/uml

   FILES:= \
   FILES:= \

-       $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/sound/soundcore.ko \
+       $(LINUX_DIR)/arch/um/drivers/hostaudio.ko

   AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
 endef
 
   AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
 endef
 


@@ -76,13 +92,19 @@ endef
 
 $(eval $(call KernelPackage,sound-core))
 
 
 $(eval $(call KernelPackage,sound-core))
 

-define KernelPackage/sound-i8x0
+
+define AddDepends/sound

   SUBMENU:=$(SOUND_MENU)
   SUBMENU:=$(SOUND_MENU)

+  DEPENDS+=kmod-sound-core $(1) @!TARGET_uml
+endef
+
+
+define KernelPackage/sound-i8x0

   TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
   TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller

-  DEPENDS:=kmod-sound-core

   KCONFIG:=CONFIG_SND_INTEL8X0
   KCONFIG:=CONFIG_SND_INTEL8X0

-  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.ko

   AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)
   AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)

+  $(call AddDepends/sound)

 endef
 
 define KernelPackage/sound-i8x0/description
 endef
 
 define KernelPackage/sound-i8x0/description


@@ -93,31 +115,15 @@ endef
 
 $(eval $(call KernelPackage,sound-i8x0))
 
 
 $(eval $(call KernelPackage,sound-i8x0))
 

-define KernelPackage/sound-ps3
-  SUBMENU:=$(SOUND_MENU)
-  TITLE:=PS3 Audio
-  DEPENDS:=kmod-sound-core
-  KCONFIG:=CONFIG_SND_PS3 \
-               CONFIG_SND_PPC
-  FILES:=$(LINUX_DIR)/sound/ppc/snd_ps3.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,35, snd_ps3)
-endef
-
-define KernelPackage/sound-ps3/description
- support for the integrated PS3 audio device
-endef
-
-$(eval $(call KernelPackage,sound-ps3))

 
 define KernelPackage/sound-cs5535audio
 
 define KernelPackage/sound-cs5535audio

-  SUBMENU:=$(SOUND_MENU)

   TITLE:=CS5535 PCI Controller
   TITLE:=CS5535 PCI Controller

-  DEPENDS:=kmod-sound-core

   KCONFIG:=CONFIG_SND_CS5535AUDIO
   KCONFIG:=CONFIG_SND_CS5535AUDIO

-  FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/ac97_bus.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.$(LINUX_KMOD_SUFFIX) 
+  FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko \
+       $(LINUX_DIR)/sound/ac97_bus.ko \
+       $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko 

   AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio)
   AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio)

+  $(call AddDepends/sound)

 endef
 
 define KernelPackage/sound-cs5535audio/description
 endef
 
 define KernelPackage/sound-cs5535audio/description


@@ -125,3 +131,16 @@ define KernelPackage/sound-cs5535audio/description
 endef
 
 $(eval $(call KernelPackage,sound-cs5535audio))
 endef
 
 $(eval $(call KernelPackage,sound-cs5535audio))

+
+
+define KernelPackage/sound-soc-core
+  TITLE:=SoC sound support
+  KCONFIG:= \
+       CONFIG_SND_SOC \
+       CONFIG_SND_SOC_ALL_CODECS=n
+  FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko
+  AUTOLOAD:=$(call AutoLoad,55, snd-soc-core)
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-core))