From de79a7654be3805477d63b5e1377aa1ad4cf6a4d Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Fri, 6 Mar 2015 13:19:09 -0700 Subject: [PATCH] sandbox: exynos: Move CONFIG_CMD_SOUND to Kconfig Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> --- common/Kconfig | 10 ++++++++++ configs/arndale_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/snow_defconfig | 1 + include/configs/exynos5250-common.h | 1 - include/configs/sandbox.h | 1 - 7 files changed, 14 insertions(+), 2 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 0a4652b314..17930a4ff3 100644 --- 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 71c9e65782..f452b13b05 100644 --- 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 db10c191ba..299db4b1e7 100644 --- 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 95f80d9fe6..2151e89969 100644 --- 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 6b2c8bd363..8c1d64db11 100644 --- 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 e5935b6122..9f09e147a4 100644 --- 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 ec182261bd..38c6cdf2ec 100644 --- 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 -- 2.39.5