sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig

Move this over to Kconfig and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 299db4b1e7de58d6d67c481971fddb8365fe9aa2..5de7fbedb4e0cc2a390e82a057aebcaa3b39af42 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -25,3 +25,4 @@ CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y

+CONFIG_SOUND_SANDBOX=y

diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index a1c950bf867e981b450c371d0d7b7cfdf8c724f9..3b96e844806067066dad94cc5bcbc024a62e7067 100644 (file)
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -37,6 +37,15 @@ config SOUND_MAX98095
          audio data and I2C for codec control. At present it only works
          with the Samsung I2S driver.
 
          audio data and I2C for codec control. At present it only works
          with the Samsung I2S driver.
 

+config SOUND_SANDBOX
+       bool "Support sandbox emulated audio codec"
+       depends on SANDBOX && SOUND
+       help
+         U-Boot sandbox can emulate a sound device using SDL, playing the
+         sound on the host machine. This option implements the sound_init()
+         and sound_play() functions for sandbox. Note that you must install
+         the SDL libraries for this to work.
+

 config SOUND_WM8994
        bool "Support Wolfson Micro wm8994 audio codec"
        depends on I2S_SAMSUNG
 config SOUND_WM8994
        bool "Support Wolfson Micro wm8994 audio codec"
        depends on I2S_SAMSUNG

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 38c6cdf2ecd11a9a82af6a6ffd0d9be7b2c70ba0..0a3671990c55392b396c3a15d647e7040c4ef488 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -151,8 +151,6 @@
 
 #define CONFIG_BOARD_LATE_INIT
 
 
 #define CONFIG_BOARD_LATE_INIT
 

-#define CONFIG_SOUND_SANDBOX
-

 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL
 #endif
 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL
 #endif