[U-Boot] [PATCH 08/14] sandbox: exynos: Move CONFIG_SOUND to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

Signed-off-by: Simon Glass <sjg at 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 fc30508..934ffed 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_ARNDALE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
+CONFIG_SOUND=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 30b3548..c9d24d9 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -20,3 +20,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 9b76d0d..9c73cee 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDK5250=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
+CONFIG_SOUND=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 353ddb0..19c150b 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -8,3 +8,4 @@ CONFIG_DM_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 e69de29..599edae 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 ae0e5ff..e5935b6 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 4c21608..47d41d7 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -139,7 +139,6 @@
 #define CONFIG_ARCH_EARLY_INIT_R
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_SOUND
 #define CONFIG_SOUND_SANDBOX
 #define CONFIG_CMD_SOUND
 
-- 
2.2.0.rc0.207.ga3a616c