X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fsound.mk;h=4ccdc8b80626733d0e15e7fb10fc0f29dabe3926;hp=e4a4c73cfbe0fa525a625c0cd9b630a5be16eebc;hb=029910ac71c96e4e853f990925f604f8b168ec3f;hpb=fdc060ab009268f023a86174d05d976136a8b608 diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index e4a4c73cfb..4ccdc8b806 100644 --- 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-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,6 +7,46 @@ 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)) + + +# allow targets to override the soundcore stuff +SOUNDCORE_LOAD ?= \ + soundcore \ + snd \ + snd-page-alloc \ + snd-hwdep \ + snd-seq-device \ + snd-rawmidi \ + snd-timer \ + snd-pcm \ + snd-mixer-oss \ + snd-pcm-oss + +SOUNDCORE_FILES ?= \ + $(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 SUBMENU:=$(SOUND_MENU) TITLE:=Sound support @@ -26,47 +66,15 @@ define KernelPackage/sound-core CONFIG_SND_PCM_OSS \ CONFIG_SND_MIXER_OSS \ CONFIG_SOUND_OSS_CORE_PRECLAIM=y -endef - -define KernelPackage/sound-core/2.4 - FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,soundcore) -endef - -# allow 2.6 targets to override the soundcore stuff -SOUNDCORE_LOAD ?= \ - soundcore \ - snd \ - snd-page-alloc \ - snd-hwdep \ - snd-seq-device \ - snd-rawmidi \ - snd-timer \ - snd-pcm \ - 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)) + $(call AddDepends/input) 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 @@ -77,18 +85,53 @@ endef $(eval $(call KernelPackage,sound-core)) -define KernelPackage/sound/Depends +define AddDepends/sound SUBMENU:=$(SOUND_MENU) - DEPENDS:=kmod-sound-core $(1) + DEPENDS+=kmod-sound-core $(1) @!TARGET_uml +endef + + +define KernelPackage/ac97 + TITLE:=ac97 controller + KCONFIG:=CONFIG_SND_AC97_CODEC + FILES:= \ + $(LINUX_DIR)/sound/ac97_bus.ko \ + $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko + AUTOLOAD:=$(call AutoLoad,35,ac97_bus snd-ac97-codec) + $(call AddDepends/sound) +endef + +define KernelPackage/ac97/description + The ac97 controller +endef + +$(eval $(call KernelPackage,ac97)) + + +define KernelPackage/sound-seq + TITLE:=Sequencer support + FILES:= \ + $(LINUX_DIR)/sound/core/seq/snd-seq.ko \ + $(LINUX_DIR)/sound/core/seq/snd-seq-midi-event.ko \ + $(LINUX_DIR)/sound/core/seq/snd-seq-midi.ko + AUTOLOAD:=$(call AutoLoad,35,snd-seq snd-seq-midi-event snd-seq-midi) + $(call AddDepends/sound) +endef + +define KernelPackage/sound-seq/description + Kernel modules for sequencer support endef +$(eval $(call KernelPackage,sound-seq)) + define KernelPackage/sound-i8x0 -$(call KernelPackage/sound/Depends,@!TARGET_uml) TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller + DEPENDS:=+kmod-ac97 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 + AUTOLOAD:=$(call AutoLoad,36,snd-intel8x0) + $(call AddDepends/sound) endef define KernelPackage/sound-i8x0/description @@ -100,31 +143,13 @@ endef $(eval $(call KernelPackage,sound-i8x0)) -define KernelPackage/sound-ps3 -$(call KernelPackage/sound/Depends,@TARGET_ps3||TARGET_ps3chk) - TITLE:=PS3 Audio - 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 -$(call KernelPackage/sound/Depends,@!TARGET_uml) TITLE:=CS5535 PCI Controller + DEPENDS:=+kmod-ac97 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) + FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko + AUTOLOAD:=$(call AutoLoad,36,snd-cs5535audio) + $(call AddDepends/sound) endef define KernelPackage/sound-cs5535audio/description @@ -135,13 +160,44 @@ $(eval $(call KernelPackage,sound-cs5535audio)) define KernelPackage/sound-soc-core -$(call KernelPackage/sound/Depends) 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,35, snd-soc-core) + AUTOLOAD:=$(call AutoLoad,55, snd-soc-core) + $(call AddDepends/sound) endef $(eval $(call KernelPackage,sound-soc-core)) + + +define KernelPackage/sound-soc-ac97 + TITLE:=AC97 Codec support + KCONFIG:=CONFIG_SND_SOC_AC97_CODEC + FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-ac97.ko + AUTOLOAD:=$(call AutoLoad,57,snd-soc-ac97) + DEPENDS:=+kmod-ac97 +kmod-sound-soc-core + $(call AddDepends/sound) +endef + +$(eval $(call KernelPackage,sound-soc-ac97)) + + +define KernelPackage/sound-soc-gw_avila + TITLE:=Gateworks Avila SoC sound support + KCONFIG:= \ + CONFIG_SND_GW_AVILA_SOC \ + CONFIG_SND_GW_AVILA_SOC_PCM \ + CONFIG_SND_GW_AVILA_SOC_HSS + FILES:= \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \ + $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \ + $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \ + $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko + AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss) + DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core + $(call AddDepends/sound) +endef + +$(eval $(call KernelPackage,sound-soc-gw_avila))