Move this over to Kconfig and tidy up.
Signed-off-by: Simon Glass sjg@chromium.org ---
configs/sandbox_defconfig | 1 + drivers/sound/Kconfig | 9 +++++++++ include/configs/sandbox.h | 2 -- 3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 8f8f7f4..6733ed3 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -22,3 +22,4 @@ CONFIG_SPI_FLASH_SANDBOX=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 a1c950b..3b96e84 100644 --- 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.
+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 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 8fbdada..fc03519 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -139,8 +139,6 @@ #define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_SOUND_SANDBOX - #ifndef SANDBOX_NO_SDL #define CONFIG_SANDBOX_SDL #endif