diff options
| -rw-r--r-- | mk/modules.mk | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.multimedia | 51 | ||||
| -rw-r--r-- | target/native/files/etc/mdev.conf | 6 | ||||
| -rw-r--r-- | target/x86/files/etc/mdev.conf | 6 | ||||
| -rw-r--r-- | target/x86_64/files/etc/mdev.conf | 6 |
5 files changed, 55 insertions, 20 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 08497432a..3e0ecacfc 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1095,11 +1095,15 @@ $(eval $(call KMOD_template,SND_VIA82XX,snd-via82xx,\ $(MODULES_DIR)/kernel/sound/pci/snd-via82xx \ ,55)) +$(eval $(call KMOD_template,SND_INTEL8X0,snd-intel8x0,\ + $(MODULES_DIR)/kernel/sound/pci/snd-intel8x0 \ +,55)) + $(eval $(call KMOD_template,SND_ENS1370,snd-ens1370,\ $(MODULES_DIR)/kernel/sound/pci/snd-ens1370 \ ,55)) -$(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\ +$(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\ $(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \ ,55)) diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index bd45e0c35..d3261523e 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -44,68 +44,80 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI default n help +menu "Audio devices support" config ADK_KPACKAGE_KMOD_SND - prompt "kmod-sound-alsa................. ALSA sound support" + prompt "kmod-snd...................... ALSA sound support" + tristate select ADK_KPACKAGE_KMOD_SOUND select ADK_KERNEL_SND_OSSEMUL select ADK_KERNEL_SND_TIMER select ADK_KERNEL_SND_PCM select ADK_KERNEL_SND_HWDEP - tristate default n help Basic ALSA sound support. config ADK_KPACKAGE_KMOD_SND_OSSEMUL - prompt "kmod-sound-alsa-oss-emul....... ALSA OSS Emulation" - depends on ADK_KPACKAGE_KMOD_SND + prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" + tristate select ADK_KERNEL_SND_MIXER_OSS select ADK_KERNEL_SND_PCM_OSS - tristate + select ADK_KPACKAGE_KMOD_SND + default y if ADK_HARDWARE_IBM_X40 default n help ALSA OSS Emulation config ADK_KPACKAGE_KMOD_SND_AC97_CODEC - prompt "kmod-sound-alsa-ac97-codec..... ALSA AC97 codec" - depends on ADK_KPACKAGE_KMOD_SND + prompt "kmod-snd-ac97-codec........... ALSA AC97 codec" + tristate depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) - select ADK_KERNEL_SND_AC97_CODEC + default n + help + ALSA AC97 codec support. + +config ADK_KPACKAGE_KMOD_SND_INTEL8X0 + prompt "kmod-snd-intel8x0............. Intel AC97 driver" tristate + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + default y if ADK_HARDWARE_IBM_X40 default n help - ALSA AC97 driver + Driver for intel chipsets. config ADK_KPACKAGE_KMOD_SND_VIA82XX - prompt "kmod-sound-alsa-via82xx........ ALSA VIA82XX driver" - depends on ADK_KPACKAGE_KMOD_SND - depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + prompt "kmod-snd-via82xx.............. ALSA VIA82XX driver" tristate + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) + select ADK_KPACKAGE_KMOD_SND default n help ALSA VIA82XX driver config ADK_KPACKAGE_KMOD_SND_ENS1370 - prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver" - depends on ADK_KPACKAGE_KMOD_SND - depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) + prompt "kmod-snd-ens1370.............. ALSA Ensoniq 1370 driver" tristate + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) + select ADK_KPACKAGE_KMOD_SND default n help ALSA Ensonique 1370 driver config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO - prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver" - depends on ADK_KPACKAGE_KMOD_SND - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver" tristate + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND default y if ADK_HARDWARE_LEMOTE_YEELONG default y if ADK_HARDWARE_ALIX1C default n help ALSA AMD CS5535 driver +endmenu + +menu "Video devices support" config ADK_KPACKAGE_KMOD_VIDEO_DEV prompt "kmod-video-dev.................. Video (For Linux) kernel support" tristate @@ -142,3 +154,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC help endmenu +endmenu diff --git a/target/native/files/etc/mdev.conf b/target/native/files/etc/mdev.conf index 363d02262..cc15d49ed 100644 --- a/target/native/files/etc/mdev.conf +++ b/target/native/files/etc/mdev.conf @@ -11,4 +11,10 @@ port 0:0 0640 ptmx 0:0 666 tty 0:0 0666 ttyS* 0:0 640 +audio root:audio 660 >snd/audio +dsp root:audio 660 >snd/dsp +timer root:audio 660 >snd/timer +controlC0 root:audio 660 >snd/controlC0 +pcmC0D0c root:audio 660 >snd/pcmC0D0c +pcmC0D0p root:audio 660 >snd/pcmC0D0p .* 0:0 644 @/lib/mdev/init diff --git a/target/x86/files/etc/mdev.conf b/target/x86/files/etc/mdev.conf index 363d02262..cc15d49ed 100644 --- a/target/x86/files/etc/mdev.conf +++ b/target/x86/files/etc/mdev.conf @@ -11,4 +11,10 @@ port 0:0 0640 ptmx 0:0 666 tty 0:0 0666 ttyS* 0:0 640 +audio root:audio 660 >snd/audio +dsp root:audio 660 >snd/dsp +timer root:audio 660 >snd/timer +controlC0 root:audio 660 >snd/controlC0 +pcmC0D0c root:audio 660 >snd/pcmC0D0c +pcmC0D0p root:audio 660 >snd/pcmC0D0p .* 0:0 644 @/lib/mdev/init diff --git a/target/x86_64/files/etc/mdev.conf b/target/x86_64/files/etc/mdev.conf index 363d02262..cc15d49ed 100644 --- a/target/x86_64/files/etc/mdev.conf +++ b/target/x86_64/files/etc/mdev.conf @@ -11,4 +11,10 @@ port 0:0 0640 ptmx 0:0 666 tty 0:0 0666 ttyS* 0:0 640 +audio root:audio 660 >snd/audio +dsp root:audio 660 >snd/dsp +timer root:audio 660 >snd/timer +controlC0 root:audio 660 >snd/controlC0 +pcmC0D0c root:audio 660 >snd/pcmC0D0c +pcmC0D0p root:audio 660 >snd/pcmC0D0p .* 0:0 644 @/lib/mdev/init |