projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
hostapd: fix AP+STA reconnects
[openwrt.git] / package / kernel / modules / sound.mk
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 1d3a5be..da56f25 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -1,5 +1,5 @@
 #
-# 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.
@@ -7,10 +7,25 @@
 
 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
-  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
+  DEPENDS:=@AUDIO_SUPPORT
   KCONFIG:= \
        CONFIG_SOUND \
        CONFIG_SND \
@@ -26,10 +41,11 @@ define KernelPackage/sound-core
        CONFIG_SND_PCM_OSS \
        CONFIG_SND_MIXER_OSS \
        CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+  $(call AddDepends/input)
 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
 
@@ -47,26 +63,26 @@ SOUNDCORE_LOAD ?= \
        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/uml-2.6
+define KernelPackage/sound-core/uml
   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
 
@@ -76,13 +92,21 @@ endef
 
 $(eval $(call KernelPackage,sound-core))
 
-define KernelPackage/sound-i8x0
+
+define AddDepends/sound
   SUBMENU:=$(SOUND_MENU)
+  DEPENDS+=kmod-sound-core $(1) @!TARGET_uml
+endef
+
+
+define KernelPackage/sound-i8x0
   TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
-  DEPENDS:=kmod-sound-core
   KCONFIG:=CONFIG_SND_INTEL8X0
-  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)
+  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.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-intel8x0)
+  $(call AddDepends/sound)
 endef
 
 define KernelPackage/sound-i8x0/description
@@ -93,32 +117,15 @@ endef
 
 $(eval $(call KernelPackage,sound-i8x0))
 
-define KernelPackage/sound-ps3
-  SUBMENU:=$(SOUND_MENU)
-  TITLE:=PS3 Audio
-  DEPENDS:=kmod-sound-core @TARGET_ps3
-  KCONFIG:=CONFIG_SND_PS3 \
-               CONFIG_SND_PPC=y \
-               CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
-  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
-  SUBMENU:=$(SOUND_MENU)
   TITLE:=CS5535 PCI Controller
-  DEPENDS:=kmod-sound-core
   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)
+  $(call AddDepends/sound)
 endef
 
 define KernelPackage/sound-cs5535audio/description
@@ -126,3 +133,57 @@ define KernelPackage/sound-cs5535audio/description
 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))
+
+
+define KernelPackage/sound-soc-omap
+  TITLE:=OMAP SoC sound support
+  KCONFIG:= \
+       CONFIG_SND_OMAP_SOC
+  FILES:=$(LINUX_DIR)/sound/soc/omap/snd-soc-omap.ko
+  AUTOLOAD:=$(call AutoLoad,60,snd-soc-omap)
+  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-core
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-omap))
+
+
+define KernelPackage/sound-soc-omap-mcbsp
+  TITLE:=OMAP SoC MCBSP support
+  KCONFIG:= \
+       CONFIG_SND_OMAP_SOC_MCBSP
+  FILES:=$(LINUX_DIR)/sound/soc/omap/snd-soc-omap-mcbsp.ko
+  AUTOLOAD:=$(call AutoLoad,61,snd-soc-omap-mcbsp)
+  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-omap
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-omap-mcbsp))
+
+
+define KernelPackage/sound-soc-n810
+  TITLE:=Nokia n810 SoC sound support
+  KCONFIG:= \
+       CONFIG_SND_OMAP_SOC_N810
+  FILES:= \
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
+       $(LINUX_DIR)/sound/soc/omap/snd-soc-n810.ko
+  AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-n810)
+  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-omap +kmod-sound-soc-omap-mcbsp
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-n810))
Personal OpenWRT clone
This page took 0.032217 seconds and 4 git commands to generate.