sandbox: exynos: Move CONFIG_CMD_SOUND to Kconfig

Move this over to Kconfig and tidy up.

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

diff --git a/common/Kconfig b/common/Kconfig
index 0a4652b..17930a4 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -339,6 +339,16 @@ config CMD_SETGETDCR
          getidcr - Get a register value via indirect DCR addressing
          setidcr - Set a register value via indirect DCR addressing
 
+config CMD_SOUND
+       bool "sound"
+       depends on SOUND
+       help
+         This provides basic access to the U-Boot's sound support. The main
+         feature is to play a beep.
+
+            sound init   - set up sound system
+            sound play   - play a sound
+
 endmenu
 
 menu "Boot timing"

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 71c9e65..f452b13 100644 (file)
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -4,3 +4,4 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ARNDALE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SOUND=y
+CONFIG_CMD_SOUND=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index db10c19..299db4b 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -24,3 +24,4 @@ CONFIG_SANDBOX_SPI=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_SOUND=y
+CONFIG_CMD_SOUND=y

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 95f80d9..2151e89 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -4,3 +4,4 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDK5250=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SOUND=y
+CONFIG_CMD_SOUND=y

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 6b2c8bd..8c1d64d 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -8,3 +8,4 @@ CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_SOUND=y
+CONFIG_CMD_SOUND=y

diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index e5935b6..9f09e14 100644 (file)
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR        CONFIG_IRAM_STACK
 
 /* Sound */
-#define CONFIG_CMD_SOUND
 #ifdef CONFIG_CMD_SOUND
 #define CONFIG_I2S_SAMSUNG
 #define CONFIG_I2S

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index ec18226..38c6cdf 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -152,7 +152,6 @@
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SOUND_SANDBOX
-#define CONFIG_CMD_SOUND
 
 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL