[tools] reorder dependencies

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

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 8a1b4ef..da56f25 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -10,9 +10,8 @@ SOUND_MENU:=Sound Support
 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)
+  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko
   AUTOLOAD:=$(call AutoLoad,50,pcspkr)
 endef
 
@@ -46,7 +45,7 @@ define KernelPackage/sound-core
 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
 
@@ -64,16 +63,16 @@ 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)
@@ -82,8 +81,8 @@ endef
 
 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
 
@@ -103,8 +102,10 @@ endef
 define KernelPackage/sound-i8x0
   TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
   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
 
@@ -120,9 +121,9 @@ $(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) 
+  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
@@ -145,3 +146,44 @@ define KernelPackage/sound-soc-core
 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))