[package] fix kmod-swconfig module loading typo

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

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 11d816b..8a1b4ef 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -1,18 +1,32 @@
 #
 #

-# Copyright (C) 2006 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
 

-# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
+define KernelPackage/pcspkr
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=PC speaker support
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_INPUT_PCSPKR
+  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX)
+  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:=@USB_SUPPORT||PCI_SUPPORT @!TARGET_atheros
+  DEPENDS:=@AUDIO_SUPPORT

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


@@ -24,7 +38,11 @@ define KernelPackage/sound-core
        CONFIG_SND_VIRMIDI \
        CONFIG_SND_SEQ_DUMMY \
        CONFIG_SND_SEQUENCER_OSS=y \
        CONFIG_SND_VIRMIDI \
        CONFIG_SND_SEQ_DUMMY \
        CONFIG_SND_SEQUENCER_OSS=y \

-       CONFIG_HOSTAUDIO
+       CONFIG_HOSTAUDIO \
+       CONFIG_SND_PCM_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


@@ -32,19 +50,8 @@ define KernelPackage/sound-core/2.4
   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 

-define KernelPackage/sound-core/2.6
-  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) \
-       $(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \
-       $(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX))
-  AUTOLOAD:=$(call AutoLoad,30, \
+# allow 2.6 targets to override the soundcore stuff
+SOUNDCORE_LOAD ?= \

        soundcore \
        snd \
        snd-page-alloc \
        soundcore \
        snd \
        snd-page-alloc \


@@ -53,12 +60,27 @@ define KernelPackage/sound-core/2.6
        snd-rawmidi \
        snd-timer \
        snd-pcm \
        snd-rawmidi \
        snd-timer \
        snd-pcm \

-       $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
-       $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
-  )
+       snd-mixer-oss \
+       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)
+
+define KernelPackage/sound-core/2.6
+  FILES:=$(SOUNDCORE_FILES)
+  AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))

 endef
 
 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)
   FILES:= \
        $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)


@@ -71,13 +93,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
   FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)
   KCONFIG:=CONFIG_SND_INTEL8X0
   FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)

+  $(call AddDepends/sound)

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


@@ -88,3 +116,32 @@ endef
 
 $(eval $(call KernelPackage,sound-i8x0))
 
 
 $(eval $(call KernelPackage,sound-i8x0))
 

+
+define KernelPackage/sound-cs5535audio
+  TITLE:=CS5535 PCI Controller
+  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) 
+  AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio)
+  $(call AddDepends/sound)
+endef
+
+define KernelPackage/sound-cs5535audio/description
+ support for the integrated AC97 sound device on olpc
+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))