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 77128aa..19d638e 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -333,6 +333,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 934ffed..7102d27 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -4,3 +4,4 @@ CONFIG_SPL=y +S: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 c9d24d9..8f8f7f4 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -21,3 +21,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 9c73cee..06f2bd9 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -4,3 +4,4 @@ CONFIG_SPL=y +S: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 19c150b..817e8f3 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -9,3 +9,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 --- 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 47d41d7..8fbdada 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -140,7 +140,6 @@ #define CONFIG_BOARD_LATE_INIT
#define CONFIG_SOUND_SANDBOX -#define CONFIG_CMD_SOUND
#ifndef SANDBOX_NO_SDL #define CONFIG_SANDBOX_SDL