From 9b2a8e8c0e090ecf52d00a71cce17a274ce2cb32 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 12 Sep 2017 14:10:15 -0600 Subject: [PATCH] Rename CONFIG_AUDIO_DEVICES to CONFIG_DRIVERS_AUDIO to conform better to the evolving configuration naming standard. --- configs/mikroe-stm32f4/fulldemo/defconfig | 2 +- configs/sama5d3-xplained/README.txt | 2 +- configs/sama5d3x-ek/README.txt | 4 ++-- configs/sama5d3x-ek/nxplayer/defconfig | 2 +- configs/sama5d4-ek/README.txt | 2 +- configs/sama5d4-ek/elf/defconfig | 2 +- configs/sama5d4-ek/ipv6/defconfig | 2 +- configs/sama5d4-ek/knsh/defconfig.ROMFS | 2 +- configs/sama5d4-ek/nsh/defconfig | 2 +- configs/sama5d4-ek/nxwm/defconfig | 2 +- configs/stm32f103-minimum/audio_tone/defconfig | 2 +- drivers/Kconfig | 6 +++--- drivers/audio/Kconfig | 2 +- drivers/audio/Make.defs | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index f5bb94340b..b4b2e1e874 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/configs/mikroe-stm32f4/fulldemo/defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_FORMAT_MIDI=y CONFIG_AUDIO=y CONFIG_BOARD_LOOPSPERMSEC=16717 diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt index a124cd728f..3667b73a08 100644 --- a/configs/sama5d3-xplained/README.txt +++ b/configs/sama5d3-xplained/README.txt @@ -2643,7 +2643,7 @@ I2S Audio Support Drivers -> Audio CONFIG_I2S=y : General I2S support - CONFIG_AUDIO_DEVICES=y : Audio device support + CONFIG_DRIVERS_AUDIO=y : Audio device support CONFIG_AUDIO_I2SCHAR=y : Build I2S character driver The following describes how I have the test application at diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index 1fa017aaf7..5f904171f3 100644 --- a/configs/sama5d3x-ek/README.txt +++ b/configs/sama5d3x-ek/README.txt @@ -2999,7 +2999,7 @@ I2S Audio Support Drivers -> Audio CONFIG_I2S=y : General I2S support - CONFIG_AUDIO_DEVICES=y : Audio device support + CONFIG_DRIVERS_AUDIO=y : Audio device support CONFIG_AUDIO_WM8904=y : Build WM8904 driver character driver Board Selection @@ -3082,7 +3082,7 @@ I2S Audio Support Drivers -> Audio CONFIG_I2S=y : General I2S support - CONFIG_AUDIO_DEVICES=y : Audio device support + CONFIG_DRIVERS_AUDIO=y : Audio device support CONFIG_AUDIO_I2SCHAR=y : Build I2S character driver The following describes how I have the test application at diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig index cc4c8471b8..01bdaeccfe 100644 --- a/configs/sama5d3x-ek/nxplayer/defconfig +++ b/configs/sama5d3x-ek/nxplayer/defconfig @@ -14,7 +14,7 @@ CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=49341 diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index c8bb1c0192..e898c6923a 100644 --- a/configs/sama5d4-ek/README.txt +++ b/configs/sama5d4-ek/README.txt @@ -2996,7 +2996,7 @@ Audio Support Drivers -> Audio CONFIG_I2S=y : General I2S support - CONFIG_AUDIO_DEVICES=y : Audio device support + CONFIG_DRIVERS_AUDIO=y : Audio device support CONFIG_AUDIO_WM8904=y : Build WM8904 driver character driver Board Selection diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig index 7c3795b5a9..b5e13a282d 100644 --- a/configs/sama5d4-ek/elf/defconfig +++ b/configs/sama5d4-ek/elf/defconfig @@ -22,7 +22,7 @@ CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig index 660206e13b..7f575fd3be 100644 --- a/configs/sama5d4-ek/ipv6/defconfig +++ b/configs/sama5d4-ek/ipv6/defconfig @@ -18,7 +18,7 @@ CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS index d1cbdee184..7038187bc3 100644 --- a/configs/sama5d4-ek/knsh/defconfig.ROMFS +++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS @@ -470,7 +470,7 @@ CONFIG_RTC_DATETIME=y # CONFIG_WATCHDOG is not set # CONFIG_TIMER is not set # CONFIG_ANALOG is not set -# CONFIG_AUDIO_DEVICES is not set +# CONFIG_DRIVERS_AUDIO is not set # CONFIG_DRIVERS_VIDEO is not set # CONFIG_BCH is not set # CONFIG_INPUT is not set diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index def69504eb..517ae5994e 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -17,7 +17,7 @@ CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index 056408eae8..9fe76af090 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -20,7 +20,7 @@ CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_NULL=y CONFIG_AUDIO_NUM_BUFFERS=4 CONFIG_AUDIO=y diff --git a/configs/stm32f103-minimum/audio_tone/defconfig b/configs/stm32f103-minimum/audio_tone/defconfig index e268699b41..55448e27e6 100644 --- a/configs/stm32f103-minimum/audio_tone/defconfig +++ b/configs/stm32f103-minimum/audio_tone/defconfig @@ -16,7 +16,7 @@ CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH="arm" -CONFIG_AUDIO_DEVICES=y +CONFIG_DRIVERS_AUDIO=y CONFIG_AUDIO_TONE=y CONFIG_AUDIO=y CONFIG_BOARD_LOOPSPERMSEC=5483 diff --git a/drivers/Kconfig b/drivers/Kconfig index 5cff7fe782..e524ccd5fe 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -255,7 +255,7 @@ if ANALOG source drivers/analog/Kconfig endif # ANALOG -menuconfig AUDIO_DEVICES +menuconfig DRIVERS_AUDIO bool "Audio Device Support" default n ---help--- @@ -266,9 +266,9 @@ menuconfig AUDIO_DEVICES NOTE: All of these drivers depend on support from the audio subsystem enabled with the AUDIO selection. -if AUDIO_DEVICES +if DRIVERS_AUDIO source drivers/audio/Kconfig -endif # AUDIO_DEVICES +endif # DRIVERS_AUDIO menuconfig DRIVERS_VIDEO bool "Video Device Support" diff --git a/drivers/audio/Kconfig b/drivers/audio/Kconfig index 804d48a211..aad77e7ea5 100644 --- a/drivers/audio/Kconfig +++ b/drivers/audio/Kconfig @@ -38,7 +38,7 @@ endif # AUDIO_I2SCHAR config AUDIO_TONE bool "Audio Tone Generator using PWM" default n - depends on PWM && AUDIO_DEVICES + depends on PWM && DRIVERS_AUDIO ---help--- This driver enables the Audio Tone Generator for NuttX. diff --git a/drivers/audio/Make.defs b/drivers/audio/Make.defs index 210d92c124..acba0d1a8e 100644 --- a/drivers/audio/Make.defs +++ b/drivers/audio/Make.defs @@ -37,7 +37,7 @@ # Include Audio drivers -ifeq ($(CONFIG_AUDIO_DEVICES),y) +ifeq ($(CONFIG_DRIVERS_AUDIO),y) ifeq ($(CONFIG_AUDIO_VS1053),y) CSRCS += vs1053.c