diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 4aa14af057fd2e36643e05efeb75e98e2ac9b666..71c9e65782757d7c84855354b75c13d74e40115d 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ARNDALE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
+CONFIG_SOUND=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index c8c888dd68713a3330101715eeba4d7726cd8c59..db10c191bab212703c61dd8c8b99f01f21827a42 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -23,3 +23,4 @@ CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_TPM_TIS_SANDBOX=y
+CONFIG_SOUND=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index efc738bfeb3d1af9af726d90af28846247c31299..95f80d9fe6460e6f4f0f0c38103a8cf827769c7a 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDK5250=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
+CONFIG_SOUND=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 6417a771618572e2161788740fafdd10e15ecfce..6b2c8bd363e39b9c8398c886a65b83f1a45c046f 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -7,3 +7,4 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
+CONFIG_SOUND=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..599edae97f27265b63e94e5ac14bc7a11505f334 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -0,0 +1,11 @@
+config SOUND
+	bool "Enable sound support"
+	help
+	  Support making sounds through an audio codec. This is normally a
+	  beep at a chosen frequency for a selected length of time. However
+	  the drivers support playing arbitrary sound samples using a
+	  PCM interface.
+
+	  Note: At present the sound setup is somewhat tangled up in that the
+	  audio codecs are called from the sound-i2s code. This could be
+	  converted to driver model.
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index ae0e5ff47b096a48f2a1a798070a80a06ad52f52..e5935b61228f1d8c211312f7b3ff0303d6934426 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -31,7 +31,6 @@
 /* Sound */
 #define CONFIG_CMD_SOUND
 #ifdef CONFIG_CMD_SOUND
-#define CONFIG_SOUND
 #define CONFIG_I2S_SAMSUNG
 #define CONFIG_I2S
 #define CONFIG_SOUND_MAX98095
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 842fbe27072df1dfc2d6b8a095998cb2fbfc078a..ec182261bdb585d4d6153333f80055b5ce3cde94 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -151,7 +151,6 @@
 
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_SOUND
 #define CONFIG_SOUND_SANDBOX
 #define CONFIG_CMD_SOUND