From 8ad2da1937168d48a84dcf6d5cc2001c0e4a6992 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 26 Feb 2007 15:55:43 +0100 Subject: [ALSA] Enable Kconfig options for external firmwares Some drivers are already ifdefs for enabling external firmwares but not defined in Kconfig. Now they appear as the kernel configs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/pci/Kconfig | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'sound/pci/Kconfig') diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 1bcfb3aac18..12dfda3123a 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -576,7 +576,6 @@ config SND_INTEL8X0M config SND_KORG1212 tristate "Korg 1212 IO" depends on SND - select FW_LOADER select SND_PCM help Say Y here to include support for Korg 1212IO soundcards. @@ -584,6 +583,16 @@ config SND_KORG1212 To compile this driver as a module, choose M here: the module will be called snd-korg1212. +config SND_KORG1212_FIRMWARE_IN_KERNEL + bool "In-kernel firmware for Korg1212 driver" + depends on SND_KORG1212 + select FW_LOADER + default y + help + Say Y here to include the static firmware built in the kernel + for Korg1212 driver. If you choose N here, the external + firmware files from alsa-plugins pacakge are necessary. + config SND_MAESTRO3 tristate "ESS Allegro/Maestro3" depends on SND @@ -596,6 +605,16 @@ config SND_MAESTRO3 To compile this driver as a module, choose M here: the module will be called snd-maestro3. +config SND_MAESTRO3_FIRMWARE_IN_KERNEL + bool "In-kernel firmware for Maestro3 driver" + depends on SND_MAESTRO3 + select FW_LOADER + default y + help + Say Y here to include the static firmware built in the kernel + for Maestro3 driver. If you choose N here, the external + firmware files from alsa-plugins pacakge are necessary. + config SND_MIXART tristate "Digigram miXart" depends on SND @@ -737,7 +756,6 @@ config SND_VX222 config SND_YMFPCI tristate "Yamaha YMF724/740/744/754" depends on SND - select FW_LOADER select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC @@ -748,6 +766,16 @@ config SND_YMFPCI To compile this driver as a module, choose M here: the module will be called snd-ymfpci. +config SND_YMFPCI_FIRMWARE_IN_KERNEL + bool "In-kernel firmware for YMFPCI driver" + depends on SND_YMFPCI + select FW_LOADER + default y + help + Say Y here to include the static firmware built in the kernel + for YMFPCI driver. If you choose N here, the external + firmware files from alsa-plugins pacakge are necessary. + config SND_AC97_POWER_SAVE bool "AC97 Power-Saving Mode" depends on SND_AC97_CODEC && EXPERIMENTAL -- cgit v1.2.3 From badec46ddf7c2d1cb0b944332746828c48debe40 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 12 Mar 2007 08:30:16 +0100 Subject: [ALSA] Kconfig: fix FW_LOADER dependencies Move the FW_LOADER dependencies out of the *_FIRMWARE_IN_KERNEL entries because these drivers use the firmware loader regardless of whether there is an in-kernel firmware image. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela --- sound/pci/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sound/pci/Kconfig') diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 12dfda3123a..b8e64581280 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -576,6 +576,7 @@ config SND_INTEL8X0M config SND_KORG1212 tristate "Korg 1212 IO" depends on SND + select FW_LOADER select SND_PCM help Say Y here to include support for Korg 1212IO soundcards. @@ -586,7 +587,6 @@ config SND_KORG1212 config SND_KORG1212_FIRMWARE_IN_KERNEL bool "In-kernel firmware for Korg1212 driver" depends on SND_KORG1212 - select FW_LOADER default y help Say Y here to include the static firmware built in the kernel @@ -608,7 +608,6 @@ config SND_MAESTRO3 config SND_MAESTRO3_FIRMWARE_IN_KERNEL bool "In-kernel firmware for Maestro3 driver" depends on SND_MAESTRO3 - select FW_LOADER default y help Say Y here to include the static firmware built in the kernel @@ -756,6 +755,7 @@ config SND_VX222 config SND_YMFPCI tristate "Yamaha YMF724/740/744/754" depends on SND + select FW_LOADER select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC @@ -769,7 +769,6 @@ config SND_YMFPCI config SND_YMFPCI_FIRMWARE_IN_KERNEL bool "In-kernel firmware for YMFPCI driver" depends on SND_YMFPCI - select FW_LOADER default y help Say Y here to include the static firmware built in the kernel -- cgit v1.2.3 From d65b790adbd8ea4b4c9687eda722d7b2a730ed02 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 12 Mar 2007 08:30:58 +0100 Subject: [ALSA] Kconfig: clarify help text for external firmware entries The external firmware files are not in the alsa-plugins but in the alsa-firmware package. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela --- sound/pci/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sound/pci/Kconfig') diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index b8e64581280..9ed4f2fa8fe 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -590,8 +590,8 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL default y help Say Y here to include the static firmware built in the kernel - for Korg1212 driver. If you choose N here, the external - firmware files from alsa-plugins pacakge are necessary. + for the Korg1212 driver. If you choose N here, you need to + install the firmware files from the alsa-firmware package. config SND_MAESTRO3 tristate "ESS Allegro/Maestro3" @@ -611,8 +611,8 @@ config SND_MAESTRO3_FIRMWARE_IN_KERNEL default y help Say Y here to include the static firmware built in the kernel - for Maestro3 driver. If you choose N here, the external - firmware files from alsa-plugins pacakge are necessary. + for the Maestro3 driver. If you choose N here, you need to + install the firmware files from the alsa-firmware package. config SND_MIXART tristate "Digigram miXart" @@ -772,8 +772,8 @@ config SND_YMFPCI_FIRMWARE_IN_KERNEL default y help Say Y here to include the static firmware built in the kernel - for YMFPCI driver. If you choose N here, the external - firmware files from alsa-plugins pacakge are necessary. + for the YMFPCI driver. If you choose N here, you need to + install the firmware files from the alsa-firmware package. config SND_AC97_POWER_SAVE bool "AC97 Power-Saving Mode" -- cgit v1.2.3 From 1327e2b859d725f94687f80e7719a367501b3be2 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Thu, 3 May 2007 17:56:59 +0200 Subject: [ALSA] do not depend on FW_LOADER when internal firmware images are used Since request_firmware() is no longer used when the internal firmware images are used, it is no longer necessary to depend on FW_LOADER in this case. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela --- sound/pci/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sound/pci/Kconfig') diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 9ed4f2fa8fe..61e35ecc57b 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -576,7 +576,7 @@ config SND_INTEL8X0M config SND_KORG1212 tristate "Korg 1212 IO" depends on SND - select FW_LOADER + select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL select SND_PCM help Say Y here to include support for Korg 1212IO soundcards. @@ -596,7 +596,7 @@ config SND_KORG1212_FIRMWARE_IN_KERNEL config SND_MAESTRO3 tristate "ESS Allegro/Maestro3" depends on SND - select FW_LOADER + select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL select SND_AC97_CODEC help Say Y here to include support for soundcards based on ESS Maestro 3 @@ -755,7 +755,7 @@ config SND_VX222 config SND_YMFPCI tristate "Yamaha YMF724/740/744/754" depends on SND - select FW_LOADER + select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC -- cgit v1.2.3