summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-20 10:27:38 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-20 10:27:38 +0000
commitdbebb3f8b0674c01d9b5bc0bf5c5d5d0f368c2af (patch)
tree2755b94674ec8aae5bd6e901c7ef459eb93afff7
parentb3d1bf8b9cccfec14d5dcb4ae0f62e66a3220619 (diff)
move kernel sound support in its own file from other.mk to sound.mk, rename kmod-soundcore to kmod-sound-core to be consistent, cleanup alsa-lib
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8865 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/other.mk66
-rw-r--r--package/kernel/modules/sound.mk75
2 files changed, 75 insertions, 66 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 171c9ce71..c13675739 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -92,72 +92,6 @@ endef
$(eval $(call KernelPackage,lp))
-# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
-define KernelPackage/soundcore
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Sound support
- DEPENDS:=@USB_SUPPORT @!TARGET_atheros
- KCONFIG:= \
- CONFIG_SOUND \
- CONFIG_SND \
- CONFIG_SND_HWDEP \
- CONFIG_SND_RAWMIDI \
- CONFIG_SND_TIMER \
- CONFIG_SND_PCM \
- CONFIG_HOSTAUDIO
-endef
-
-define KernelPackage/soundcore/2.4
- FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,soundcore)
-endef
-
-define KernelPackage/soundcore/2.6
-# KCONFIG+= \
-# CONFIG_SND \
-# CONFIG_SND_HWDEP \
-# CONFIG_SND_RAWMIDI \
-# CONFIG_SND_TIMER \
-# CONFIG_SND_PCM
- 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/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, \
- soundcore \
- snd \
- snd-page-alloc \
- snd-hwdep \
- snd-rawmidi \
- snd-timer \
- snd-pcm \
- $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
- $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
- )
-endef
-
-define KernelPackage/soundcore/uml-2.6
-# KCONFIG+= \
-# CONFIG_HOSTAUDIO
- FILES:= \
- $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
-endef
-
-define KernelPackage/soundcore/description
- Kernel modules for sound support
-endef
-
-$(eval $(call KernelPackage,soundcore))
-
-
define KernelPackage/pcmcia-core
SUBMENU:=$(OTHER_MENU)
TITLE:=PCMCIA/CardBus support
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
new file mode 100644
index 000000000..78dd33469
--- /dev/null
+++ b/package/kernel/modules/sound.mk
@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+SOUND_MENU:=Sound Support
+
+# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
+define KernelPackage/sound-core
+ SUBMENU:=$(SOUND_MENU)
+ TITLE:=Sound support
+ DEPENDS:=@USB_SUPPORT @!TARGET_atheros
+ KCONFIG:= \
+ CONFIG_SOUND \
+ CONFIG_SND \
+ CONFIG_SND_HWDEP \
+ CONFIG_SND_RAWMIDI \
+ CONFIG_SND_TIMER \
+ CONFIG_SND_PCM \
+ CONFIG_HOSTAUDIO
+endef
+
+define KernelPackage/sound-core/2.4
+ FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,soundcore)
+endef
+
+define KernelPackage/sound-core/2.6
+# KCONFIG+= \
+# CONFIG_SND \
+# CONFIG_SND_HWDEP \
+# CONFIG_SND_RAWMIDI \
+# CONFIG_SND_TIMER \
+# CONFIG_SND_PCM
+ 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/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, \
+ soundcore \
+ snd \
+ snd-page-alloc \
+ snd-hwdep \
+ snd-rawmidi \
+ snd-timer \
+ snd-pcm \
+ $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
+ $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
+ )
+endef
+
+define KernelPackage/sound-core/uml-2.6
+# KCONFIG+= \
+# CONFIG_HOSTAUDIO
+ FILES:= \
+ $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
+endef
+
+define KernelPackage/sound-core/description
+ Kernel modules for sound support
+endef
+
+$(eval $(call KernelPackage,sound-core))
+