From ef35d98aa4fa2faca259f55275a74a488f740540 Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Fri, 6 Mar 2015 13:19:08 -0700 Subject: [PATCH] sandbox: exynos: Move CONFIG_SOUND to Kconfig Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/arndale_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/snow_defconfig | 1 + drivers/sound/Kconfig | 11 +++++++++++ include/configs/exynos5250-common.h | 1 - include/configs/sandbox.h | 1 - 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index 4aa14af057..71c9e65782 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -3,3 +3,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_ARNDALE=y CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale" +CONFIG_SOUND=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index c8c888dd68..db10c191ba 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -23,3 +23,4 @@ CONFIG_SYS_I2C_SANDBOX=y CONFIG_SANDBOX_SPI=y CONFIG_SPI_FLASH_SANDBOX=y CONFIG_TPM_TIS_SANDBOX=y +CONFIG_SOUND=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index efc738bfeb..95f80d9fe6 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -3,3 +3,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_SMDK5250=y CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250" +CONFIG_SOUND=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 6417a77161..6b2c8bd363 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -7,3 +7,4 @@ CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_KEYB=y CONFIG_CMD_CROS_EC=y +CONFIG_SOUND=y diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig index e69de29bb2..599edae97f 100644 --- a/drivers/sound/Kconfig +++ b/drivers/sound/Kconfig @@ -0,0 +1,11 @@ +config SOUND + bool "Enable sound support" + help + Support making sounds through an audio codec. This is normally a + beep at a chosen frequency for a selected length of time. However + the drivers support playing arbitrary sound samples using a + PCM interface. + + Note: At present the sound setup is somewhat tangled up in that the + audio codecs are called from the sound-i2s code. This could be + converted to driver model. diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index ae0e5ff47b..e5935b6122 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -31,7 +31,6 @@ /* Sound */ #define CONFIG_CMD_SOUND #ifdef CONFIG_CMD_SOUND -#define CONFIG_SOUND #define CONFIG_I2S_SAMSUNG #define CONFIG_I2S #define CONFIG_SOUND_MAX98095 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 842fbe2707..ec182261bd 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -151,7 +151,6 @@ #define CONFIG_BOARD_LATE_INIT -#define CONFIG_SOUND #define CONFIG_SOUND_SANDBOX #define CONFIG_CMD_SOUND -- 2.39.5