[U-Boot] [PATCH 10/14] sandbox: exynos: Move CONFIG_I2S 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/smdk5250_defconfig          | 1 +
 configs/snow_defconfig              | 1 +
 drivers/sound/Kconfig               | 9 +++++++++
 include/configs/exynos5250-common.h | 1 -
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 7102d27..9c0b62f 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 06f2bd9..42908b4 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 817e8f3..368fb3c 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -10,3 +10,4 @@ CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 599edae..759a10f 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -9,3 +9,12 @@ config SOUND
 	  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.
+
+config I2S
+	bool "Enable I2S support"
+	depends on SOUND
+	help
+	  I2S is a serial bus often used to transmit audio data from the
+	  SoC to the audio codec. This option enables sound support using
+	  I2S. It calls either of the two supported codecs (no use is made
+	  of driver model at present).
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 9f09e14..c9eac15 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -31,7 +31,6 @@
 /* Sound */
 #ifdef CONFIG_CMD_SOUND
 #define CONFIG_I2S_SAMSUNG
-#define CONFIG_I2S
 #define CONFIG_SOUND_MAX98095
 #define CONFIG_SOUND_WM8994
 #endif
-- 
2.2.0.rc0.207.ga3a616c