[U-Boot] [PATCH 0/14] sandbox: exynos: Move some (mostly) sandbox CONFIG options to Kconfig

[U-Boot] [PATCH 0/14] sandbox: exynos: Move some (mostly) sandbox CONFIG options to Kconfig

[Simon Glass]

These options relate to the sandbox drivers and also sound. There are still
more options to move, but this is a start.


Simon Glass (14):
  sandbox: Move GPIO CONFIGs to Kconfig
  sandbox: Move CONFIG_SYS_VSNPRINTF to Kconfig
  sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig
  sandbox: Move CONFIG_SYS_I2C_SANDBOX to Kconfig
  sandbox: Move CONFIG_SANDBOX_SPI to Kconfig
  sandbox: Move CONFIG_SPI_FLASH_SANDBOX to Kconfig
  sandbox: Move CONFIG_TPM_TIS_SANDBOX to Kconfig
  sandbox: exynos: Move CONFIG_SOUND to Kconfig
  sandbox: exynos: Move CONFIG_CMD_SOUND to Kconfig
  sandbox: exynos: Move CONFIG_I2S to Kconfig
  sandbox: exynos: Move CONFIG_I2S_SAMSUNG to Kconfig
  sandbox: exynos: Move CONFIG_SOUND_MAX98095 to Kconfig
  sandbox: exynos: Move CONFIG_SOUND_WM8994 to Kconfig
  sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig

 arch/x86/Kconfig                    |  3 ++
 common/Kconfig                      | 10 +++++++
 configs/arndale_defconfig           |  5 ++++
 configs/sandbox_defconfig           | 10 +++++++
 configs/smdk5250_defconfig          |  5 ++++
 configs/snow_defconfig              |  5 ++++
 drivers/gpio/Kconfig                | 21 ++++++++++++++
 drivers/i2c/Kconfig                 | 30 ++++++++++++++++++++
 drivers/mtd/spi/Kconfig             | 10 +++++++
 drivers/serial/Kconfig              | 20 ++++++++++++++
 drivers/serial/serial-uclass.c      |  5 ++--
 drivers/sound/Kconfig               | 55 +++++++++++++++++++++++++++++++++++++
 drivers/spi/Kconfig                 | 25 +++++++++++++++++
 drivers/tpm/Kconfig                 |  7 +++++
 include/configs/exynos5250-common.h | 10 -------
 include/configs/sandbox.h           | 16 -----------
 include/configs/x86-common.h        |  1 -
 include/fdtdec.h                    |  6 ++++
 lib/Kconfig                         |  9 ++++++
 19 files changed, 224 insertions(+), 29 deletions(-)

-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 01/14] sandbox: Move GPIO CONFIGs to Kconfig

[Simon Glass]

Move these over to Kconfig and tidy up/

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

 configs/sandbox_defconfig |  1 +
 drivers/gpio/Kconfig      | 21 +++++++++++++++++++++
 include/configs/sandbox.h |  2 --
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 3255003..15d13b5 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -13,3 +13,4 @@ CONFIG_CROS_EC_SANDBOX=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_BOOTSTAGE=y
+CONFIG_SANDBOX_GPIO=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b609e73..6a682f2 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -7,3 +7,24 @@ config DM_GPIO
 	  the GPIO uclass. Drivers provide methods to query the
 	  particular GPIOs that they provide. The uclass interface
 	  is defined in include/asm-generic/gpio.h.
+
+config SANDBOX_GPIO
+	bool "Enable sandbox GPIO driver"
+	depends on SANDBOX && DM && DM_GPIO
+	help
+	  This driver supports some simulated GPIOs which can be adjusted
+	  using 'back door' functions like sandbox_gpio_set_value(). Then the
+	  GPIOs can be inspected through the normal get_get_value()
+	  interface. The purpose of this is to allow GPIOs to be used as
+	  normal in sandbox, perhaps with test code actually driving the
+	  behaviour of those GPIOs.
+
+config SANDBOX_GPIO_COUNT
+	int "Number of sandbox GPIOs"
+	depends on SANDBOX_GPIO
+	default 128
+	help
+	  The sandbox driver can support any number of GPIOs. Generally these
+	  are specified using the device tree. But you can also have a number
+	  of 'anonymous' GPIOs that do not belong to any device or bank.
+	  Select a suitable value depending on your needs.
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index bc8a392..a880acb 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -49,8 +49,6 @@
 #define CONFIG_SYS_VSNPRINTF
 
 #define CONFIG_CMD_GPIO
-#define CONFIG_SANDBOX_GPIO
-#define CONFIG_SANDBOX_GPIO_COUNT	128
 
 #define CONFIG_CMD_GPT
 #define CONFIG_PARTITION_UUIDS
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 01/14] sandbox: Move GPIO CONFIGs to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move these over to Kconfig and tidy up/
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/sandbox_defconfig |  1 +
>  drivers/gpio/Kconfig      | 21 +++++++++++++++++++++
>  include/configs/sandbox.h |  2 --
>  3 files changed, 22 insertions(+), 2 deletions(-)

Changed / to . in the comment message.

Applied to u-boot-dm/next.

[U-Boot] [PATCH 02/14] sandbox: Move CONFIG_SYS_VSNPRINTF to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 arch/x86/Kconfig             | 3 +++
 configs/sandbox_defconfig    | 1 +
 include/configs/sandbox.h    | 2 --
 include/configs/x86-common.h | 1 -
 lib/Kconfig                  | 9 +++++++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 78a0532..2deadb2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -7,6 +7,9 @@ config SYS_ARCH
 config USE_PRIVATE_LIBGCC
 	default y
 
+config SYS_VSNPRINTF
+	default y
+
 choice
 	prompt "Target select"
 
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 15d13b5..a6c3252 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -14,3 +14,4 @@ CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_BOOTSTAGE=y
 CONFIG_SANDBOX_GPIO=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index a880acb..8d96999 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -46,8 +46,6 @@
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_MD5SUM
 
-#define CONFIG_SYS_VSNPRINTF
-
 #define CONFIG_CMD_GPIO
 
 #define CONFIG_CMD_GPT
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 75108a9..d89fdca 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -16,7 +16,6 @@
  * (easy to change)
  */
 #define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_SYS_VSNPRINTF
 #define CONFIG_ZBOOT_32
 #define CONFIG_PHYSMEM
 #define CONFIG_DISPLAY_BOARDINFO_LATE
diff --git a/lib/Kconfig b/lib/Kconfig
index c9d2767..d7fd219 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -27,6 +27,15 @@ config SYS_HZ
 	  get_timer() must operate in milliseconds and this option must be
 	  set to 1000.
 
+config SYS_VSNPRINTF
+	bool "Enable safe version of sprintf()"
+	help
+	  Since sprintf() can overflow its buffer, it is common to use
+	  snprintf() instead, which knows the buffer size and can avoid
+	  overflow. However, this does increase code size slightly (for
+	  Thumb-2, about 420 bytes). Enable this option for safety when
+	  using sprintf() with data you do not control.
+
 source lib/rsa/Kconfig
 
 menu "Hashing Support"
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 02/14] sandbox: Move CONFIG_SYS_VSNPRINTF to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  arch/x86/Kconfig             | 3 +++
>  configs/sandbox_defconfig    | 1 +
>  include/configs/sandbox.h    | 2 --
>  include/configs/x86-common.h | 1 -
>  lib/Kconfig                  | 9 +++++++++
>  5 files changed, 13 insertions(+), 3 deletions(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 03/14] sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/sandbox_defconfig      |  1 +
 drivers/serial/Kconfig         | 20 ++++++++++++++++++++
 drivers/serial/serial-uclass.c |  5 +++--
 include/configs/sandbox.h      |  1 -
 include/fdtdec.h               |  6 ++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index a6c3252..72740ef 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -15,3 +15,4 @@ CONFIG_CMD_CROS_EC=y
 CONFIG_BOOTSTAGE=y
 CONFIG_SANDBOX_GPIO=y
 CONFIG_SYS_VSNPRINTF=y
+CONFIG_SANDBOX_SERIAL=y
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 2e87199..13b0582 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -85,6 +85,26 @@ config ROCKCHIP_SERIAL
 	  your board config header. The clock input is automatically set to
 	  use the oscillator (24MHz).
 
+config SANDBOX_SERIAL
+	bool "Sandbox UART support"
+	depends on SANDBOX && DM
+	help
+	  Select this to enable a seral UART for sandbox. This is required to
+	  operate correctly, otherwise you will see no serial output from
+	  sandbox. The emulated UART will display to the console and console
+	  input will be fed into the UART. This allows you to interact with
+	  U-Boot.
+
+	  The operation of the console is controlled by the -t command-line
+	  flag. In raw mode, U-Boot sees all characters from the terminal
+	  before they are processed, including Ctrl-C. In cooked mode, Ctrl-C
+	  is processed by the terminal, and terminates U-Boot. Valid options
+	  are:
+
+	     -t raw-with-sigs	Raw mode, Ctrl-C will terminate U-Boot
+	     -t raw		Raw mode, Ctrl-C is processed by U-Boot
+	     -t cooked		Cooked mode, Ctrl-C terminates
+
 config UNIPHIER_SERIAL
 	bool "UniPhier on-chip UART support"
 	depends on ARCH_UNIPHIER && DM_SERIAL
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 6531841..400629e 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -34,7 +34,7 @@ static void serial_find_console_or_panic(void)
 	struct udevice *dev;
 	int node;
 
-	if (OF_CONTROL) {
+	if (OF_CONTROL && gd->fdt_blob) {
 		/* Check for a chosen console */
 		node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
 		if (node < 0)
@@ -56,7 +56,8 @@ static void serial_find_console_or_panic(void)
 				return;
 			}
 		}
-	} else {
+	}
+	if (!SPL_BUILD || !OF_CONTROL || !gd->fdt_blob) {
 		/*
 		* Try to use CONFIG_CONS_INDEX if available (it is numbered
 		* from 1!).
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 8d96999..3b3e1f4 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -114,7 +114,6 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
-#define CONFIG_SANDBOX_SERIAL
 
 #define CONFIG_SYS_NO_FLASH
 
diff --git a/include/fdtdec.h b/include/fdtdec.h
index bec2ee9..32a857a 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -41,6 +41,12 @@ struct fdt_memory {
 	fdt_addr_t end;
 };
 
+#ifdef CONFIG_SPL_BUILD
+#define SPL_BUILD	1
+#else
+#define SPL_BUILD	0
+#endif
+
 #ifdef CONFIG_OF_CONTROL
 # if defined(CONFIG_SPL_BUILD) && defined(SPL_DISABLE_OF_CONTROL)
 #  define OF_CONTROL 0
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 03/14] sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/sandbox_defconfig      |  1 +
>  drivers/serial/Kconfig         | 20 ++++++++++++++++++++
>  drivers/serial/serial-uclass.c |  5 +++--
>  include/configs/sandbox.h      |  1 -
>  include/fdtdec.h               |  6 ++++++
>  5 files changed, 30 insertions(+), 3 deletions(-)

Applied to u-boot-dm.

[U-Boot] [PATCH 04/14] sandbox: Move CONFIG_SYS_I2C_SANDBOX to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/sandbox_defconfig |  1 +
 drivers/i2c/Kconfig       | 30 ++++++++++++++++++++++++++++++
 include/configs/sandbox.h |  1 -
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 72740ef..8a5ae79 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -16,3 +16,4 @@ CONFIG_BOOTSTAGE=y
 CONFIG_SANDBOX_GPIO=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_SANDBOX_SERIAL=y
+CONFIG_SYS_I2C_SANDBOX=y
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 692810d..a974ac5 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -22,6 +22,36 @@ config DM_I2C_COMPAT
 	  to convert all code for a board in a single commit. It should not
 	  be enabled for any board in an official release.
 
+config SYS_I2C_SANDBOX
+	bool "Sandbox I2C driver"
+	depends on SANDBOX && DM_I2C
+	help
+	  Enable I2C support for sandbox. This is an emulation of a real I2C
+	  bus. Devices can be attached to the bus using the device tree
+	  which specifies the driver to use. As an example, see this device
+	  tree fragment from sandbox.dts. It shows that the I2C bus has a
+	  single EEPROM at address 0x2c (7-bit address) which is emulated by
+	  the driver for "sandbox,i2c-eeprom", which is in
+	  drivers/misc/i2c_eeprom_emul.c.
+
+	  i2c at 0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0>;
+		compatible = "sandbox,i2c";
+		clock-frequency = <400000>;
+		eeprom at 2c {
+			reg = <0x2c>;
+			compatible = "i2c-eeprom";
+			emul {
+				compatible = "sandbox,i2c-eeprom";
+				sandbox,filename = "i2c.bin";
+				sandbox,size = <128>;
+			};
+		};
+	};
+
+
 config SYS_I2C_UNIPHIER
 	bool "UniPhier I2C driver"
 	depends on ARCH_UNIPHIER && DM_I2C
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 3b3e1f4..fd76056 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -92,7 +92,6 @@
 #define CONFIG_SPI_FLASH_WINBOND
 
 #define CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_SANDBOX
 #define CONFIG_I2C_EDID
 #define CONFIG_I2C_EEPROM
 
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 04/14] sandbox: Move CONFIG_SYS_I2C_SANDBOX to Kconfig

[Heiko Schocher]

Hello Simon,

Am 06.03.2015 21:19, schrieb Simon Glass:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>   configs/sandbox_defconfig |  1 +
>   drivers/i2c/Kconfig       | 30 ++++++++++++++++++++++++++++++
>   include/configs/sandbox.h |  1 -
>   3 files changed, 31 insertions(+), 1 deletion(-)

Thanks!

Acked-by: Heiko Schocher<hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH 04/14] sandbox: Move CONFIG_SYS_I2C_SANDBOX to Kconfig

[Simon Glass]

On 9 March 2015 at 01:28, Heiko Schocher <hs@denx.de> wrote:
> Hello Simon,
>
> Am 06.03.2015 21:19, schrieb Simon Glass:
>>
>> Move this over to Kconfig and tidy up.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>>   configs/sandbox_defconfig |  1 +
>>   drivers/i2c/Kconfig       | 30 ++++++++++++++++++++++++++++++
>>   include/configs/sandbox.h |  1 -
>>   3 files changed, 31 insertions(+), 1 deletion(-)
>
>
> Thanks!
>
> Acked-by: Heiko Schocher<hs@denx.de>

Applied to u-boot-dm/next.

[U-Boot] [PATCH 05/14] sandbox: Move CONFIG_SANDBOX_SPI to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/sandbox_defconfig |  1 +
 drivers/spi/Kconfig       | 25 +++++++++++++++++++++++++
 include/configs/sandbox.h |  1 -
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 8a5ae79..0e3cb7f 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -17,3 +17,4 @@ CONFIG_SANDBOX_GPIO=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_SANDBOX_SERIAL=y
 CONFIG_SYS_I2C_SANDBOX=y
+CONFIG_SANDBOX_SPI=y
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7ae2727..c50d7ba 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -10,3 +10,28 @@ config DM_SPI
 	  as 'parent data' to every slave on each bus. Slaves
 	  typically use driver-private data instead of extending the
 	  spi_slave structure.
+
+config CONFIG_SANDBOX_SPI
+	bool "Sandbox SPI driver"
+	depends on SANDBOX && DM
+	help
+	  Enable SPI support for sandbox. This is an emulation of a real SPI
+	  bus. Devices can be attached to the bus using the device tree
+	  which specifies the driver to use. As an example, see this device
+	  tree fragment from sandbox.dts. It shows that the SPI bus has a
+	  single flash device on chip select 0 which is emulated by the driver
+	  for "sandbox,spi-flash", which is in drivers/mtd/spi/sandbox.c.
+
+	  spi at 0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0>;
+		compatible = "sandbox,spi";
+		cs-gpios = <0>, <&gpio_a 0>;
+		flash at 0 {
+			reg = <0>;
+			compatible = "spansion,m25p16", "sandbox,spi-flash";
+			spi-max-frequency = <40000000>;
+			sandbox,filename = "spi.bin";
+		};
+	};
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index fd76056..fddb810a 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -76,7 +76,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 /* SPI - enable all SPI flash types for testing purposes */
-#define CONFIG_SANDBOX_SPI
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SF_TEST
 #define CONFIG_CMD_SPI
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 05/14] sandbox: Move CONFIG_SANDBOX_SPI to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/sandbox_defconfig |  1 +
>  drivers/spi/Kconfig       | 25 +++++++++++++++++++++++++
>  include/configs/sandbox.h |  1 -
>  3 files changed, 26 insertions(+), 1 deletion(-)

I merged in the fix to the Kconfig which appears in the next patch. It
was in the wrong place.

Applied to u-boot-dm/next.

[U-Boot] [PATCH 06/14] sandbox: Move CONFIG_SPI_FLASH_SANDBOX to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/sandbox_defconfig |  1 +
 drivers/mtd/spi/Kconfig   | 10 ++++++++++
 drivers/spi/Kconfig       |  2 +-
 include/configs/sandbox.h |  1 -
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 0e3cb7f..2383b77 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -18,3 +18,4 @@ CONFIG_SYS_VSNPRINTF=y
 CONFIG_SANDBOX_SERIAL=y
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_SANDBOX_SPI=y
+CONFIG_SPI_FLASH_SANDBOX=y
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 2dc46b4..176979b 100644
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -12,3 +12,13 @@ config DM_SPI_FLASH
 	  during the transition parent. SPI and SPI flash must be
 	  enabled together (it is not possible to use driver model
 	  for one and not the other).
+
+config SPI_FLASH_SANDBOX
+	bool "Support sandbox SPI flash device"
+	depends on SANDBOX && DM_SPI_FLASH
+	help
+	  Since sandbox cannot access real devices, an emulation mechanism is
+	  provided instead. Drivers can be connected up to the sandbox SPI
+	  bus (see CONFIG_SANDBOX_SPI) and SPI traffic will be routed to this
+	  device. Typically the contents of the emulated SPI flash device is
+	  stored in a file on the host filesystem.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c50d7ba..c4c112c 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -11,7 +11,7 @@ config DM_SPI
 	  typically use driver-private data instead of extending the
 	  spi_slave structure.
 
-config CONFIG_SANDBOX_SPI
+config SANDBOX_SPI
 	bool "Sandbox SPI driver"
 	depends on SANDBOX && DM
 	help
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index fddb810a..d6af4e9 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -84,7 +84,6 @@
 #define CONFIG_SPI_FLASH_EON
 #define CONFIG_SPI_FLASH_GIGADEVICE
 #define CONFIG_SPI_FLASH_MACRONIX
-#define CONFIG_SPI_FLASH_SANDBOX
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SPI_FLASH_STMICRO
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 06/14] sandbox: Move CONFIG_SPI_FLASH_SANDBOX to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/sandbox_defconfig |  1 +
>  drivers/mtd/spi/Kconfig   | 10 ++++++++++
>  drivers/spi/Kconfig       |  2 +-
>  include/configs/sandbox.h |  1 -
>  4 files changed, 12 insertions(+), 2 deletions(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 07/14] sandbox: Move CONFIG_TPM_TIS_SANDBOX to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/sandbox_defconfig | 1 +
 drivers/tpm/Kconfig       | 7 +++++++
 include/configs/sandbox.h | 4 ----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 2383b77..30b3548 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -19,3 +19,4 @@ CONFIG_SANDBOX_SERIAL=y
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SPI_FLASH_SANDBOX=y
+CONFIG_TPM_TIS_SANDBOX=y
diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig
index e69de29..f408b8a 100644
--- a/drivers/tpm/Kconfig
+++ b/drivers/tpm/Kconfig
@@ -0,0 +1,7 @@
+config TPM_TIS_SANDBOX
+	bool "Enable sandbox TPM driver"
+	help
+	  This driver emulates a TPM, providing access to base functions
+	  such as reading and writing TPM private data. This is enough to
+	  support Chrome OS verified boot. Extend functionality is not
+	  implemented.
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index d6af4e9..4c21608 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -132,8 +132,6 @@
 #define CONFIG_SHA1
 #define CONFIG_SHA256
 
-#define CONFIG_TPM_TIS_SANDBOX
-
 #define CONFIG_CMD_SANDBOX
 
 #define CONFIG_BOOTARGS ""
@@ -184,8 +182,6 @@
 #define CONFIG_LZO
 #define CONFIG_LZMA
 
-#define CONFIG_TPM_TIS_SANDBOX
-
 #define CONFIG_CMD_LZMADEC
 
 #endif
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 07/14] sandbox: Move CONFIG_TPM_TIS_SANDBOX to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/sandbox_defconfig | 1 +
>  drivers/tpm/Kconfig       | 7 +++++++
>  include/configs/sandbox.h | 4 ----
>  3 files changed, 8 insertions(+), 4 deletions(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 08/14] sandbox: exynos: Move CONFIG_SOUND to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/arndale_defconfig           |  1 +
 configs/sandbox_defconfig           |  1 +
 configs/smdk5250_defconfig          |  1 +
 configs/snow_defconfig              |  1 +
 drivers/sound/Kconfig               | 11 +++++++++++
 include/configs/exynos5250-common.h |  1 -
 include/configs/sandbox.h           |  1 -
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index fc30508..934ffed 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_ARNDALE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
+CONFIG_SOUND=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 30b3548..c9d24d9 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -20,3 +20,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 9b76d0d..9c73cee 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDK5250=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
+CONFIG_SOUND=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 353ddb0..19c150b 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -8,3 +8,4 @@ CONFIG_DM_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 e69de29..599edae 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 ae0e5ff..e5935b6 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 4c21608..47d41d7 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -139,7 +139,6 @@
 #define CONFIG_ARCH_EARLY_INIT_R
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_SOUND
 #define CONFIG_SOUND_SANDBOX
 #define CONFIG_CMD_SOUND
 
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 08/14] sandbox: exynos: Move CONFIG_SOUND to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/arndale_defconfig           |  1 +
>  configs/sandbox_defconfig           |  1 +
>  configs/smdk5250_defconfig          |  1 +
>  configs/snow_defconfig              |  1 +
>  drivers/sound/Kconfig               | 11 +++++++++++
>  include/configs/exynos5250-common.h |  1 -
>  include/configs/sandbox.h           |  1 -
>  7 files changed, 15 insertions(+), 2 deletions(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 09/14] sandbox: exynos: Move CONFIG_CMD_SOUND to Kconfig

[Simon Glass]

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
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 09/14] sandbox: exynos: Move CONFIG_CMD_SOUND to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> 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(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 10/14] sandbox: exynos: Move CONFIG_I2S to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/arndale_defconfig           | 1 +
 configs/smdk5250_defconfig          | 1 +
 configs/snow_defconfig              | 1 +
 drivers/sound/Kconfig               | 9 +++++++++
 include/configs/exynos5250-common.h | 1 -
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 7102d27..9c0b62f 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 06f2bd9..42908b4 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 817e8f3..368fb3c 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -10,3 +10,4 @@ CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
+CONFIG_I2S=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 599edae..759a10f 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -9,3 +9,12 @@ config SOUND
 	  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.
+
+config I2S
+	bool "Enable I2S support"
+	depends on SOUND
+	help
+	  I2S is a serial bus often used to transmit audio data from the
+	  SoC to the audio codec. This option enables sound support using
+	  I2S. It calls either of the two supported codecs (no use is made
+	  of driver model at present).
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 9f09e14..c9eac15 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -31,7 +31,6 @@
 /* Sound */
 #ifdef CONFIG_CMD_SOUND
 #define CONFIG_I2S_SAMSUNG
-#define CONFIG_I2S
 #define CONFIG_SOUND_MAX98095
 #define CONFIG_SOUND_WM8994
 #endif
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 10/14] sandbox: exynos: Move CONFIG_I2S to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/arndale_defconfig           | 1 +
>  configs/smdk5250_defconfig          | 1 +
>  configs/snow_defconfig              | 1 +
>  drivers/sound/Kconfig               | 9 +++++++++
>  include/configs/exynos5250-common.h | 1 -
>  5 files changed, 12 insertions(+), 1 deletion(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 11/14] sandbox: exynos: Move CONFIG_I2S_SAMSUNG to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/arndale_defconfig           |  1 +
 configs/smdk5250_defconfig          |  1 +
 configs/snow_defconfig              |  1 +
 drivers/sound/Kconfig               | 10 ++++++++++
 include/configs/exynos5250-common.h |  1 -
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 9c0b62f..19f51fe 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 42908b4..35b8c13 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 368fb3c..70c2b22 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -11,3 +11,4 @@ CONFIG_CMD_CROS_EC=y
 CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
+CONFIG_I2S_SAMSUNG=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 759a10f..1b97af0 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -18,3 +18,13 @@ config I2S
 	  SoC to the audio codec. This option enables sound support using
 	  I2S. It calls either of the two supported codecs (no use is made
 	  of driver model at present).
+
+config I2S_SAMSUNG
+	bool "Enable I2C support for Samsung SoCs"
+	depends on SOUND
+	help
+	  Samsung Exynos SoCs support an I2S interface for sending audio
+	  data to an audio codec. This option enables support for this,
+	  using one of the available audio codec drivers. Enabling this
+	  option provides an implementation for sound_init() and
+	  sound_play().
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index c9eac15..895d6e1 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -30,7 +30,6 @@
 
 /* Sound */
 #ifdef CONFIG_CMD_SOUND
-#define CONFIG_I2S_SAMSUNG
 #define CONFIG_SOUND_MAX98095
 #define CONFIG_SOUND_WM8994
 #endif
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 11/14] sandbox: exynos: Move CONFIG_I2S_SAMSUNG to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/arndale_defconfig           |  1 +
>  configs/smdk5250_defconfig          |  1 +
>  configs/snow_defconfig              |  1 +
>  drivers/sound/Kconfig               | 10 ++++++++++
>  include/configs/exynos5250-common.h |  1 -
>  5 files changed, 13 insertions(+), 1 deletion(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 12/14] sandbox: exynos: Move CONFIG_SOUND_MAX98095 to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/arndale_defconfig           | 1 +
 configs/smdk5250_defconfig          | 1 +
 drivers/sound/Kconfig               | 8 ++++++++
 include/configs/exynos5250-common.h | 1 -
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 19f51fe..b176c8f 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -7,3 +7,4 @@ CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 35b8c13..bf2e4de 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -7,3 +7,4 @@ CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 1b97af0..cfc75cb 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -28,3 +28,11 @@ config I2S_SAMSUNG
 	  using one of the available audio codec drivers. Enabling this
 	  option provides an implementation for sound_init() and
 	  sound_play().
+
+config SOUND_MAX98095
+	bool "Support Maxim max98095 audio codec"
+	depends on I2S_SAMSUNG
+	help
+	  Enable the max98095 audio codec. This is connected via I2S for
+	  audio data and I2C for codec control. At present it only works
+	  with the Samsung I2S driver.
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 895d6e1..79a7adf 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -30,7 +30,6 @@
 
 /* Sound */
 #ifdef CONFIG_CMD_SOUND
-#define CONFIG_SOUND_MAX98095
 #define CONFIG_SOUND_WM8994
 #endif
 
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 12/14] sandbox: exynos: Move CONFIG_SOUND_MAX98095 to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/arndale_defconfig           | 1 +
>  configs/smdk5250_defconfig          | 1 +
>  drivers/sound/Kconfig               | 8 ++++++++
>  include/configs/exynos5250-common.h | 1 -
>  4 files changed, 10 insertions(+), 1 deletion(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 13/14] sandbox: exynos: Move CONFIG_SOUND_WM8994 to Kconfig

[Simon Glass]

Move this over to Kconfig and tidy up.

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

 configs/snow_defconfig              | 1 +
 drivers/sound/Kconfig               | 8 ++++++++
 include/configs/exynos5250-common.h | 5 -----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 70c2b22..7641ec5 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -12,3 +12,4 @@ CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index cfc75cb..a1c950b 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -36,3 +36,11 @@ config SOUND_MAX98095
 	  Enable the max98095 audio codec. This is connected via I2S for
 	  audio data and I2C for codec control. At present it only works
 	  with the Samsung I2S driver.
+
+config SOUND_WM8994
+	bool "Support Wolfson Micro wm8994 audio codec"
+	depends on I2S_SAMSUNG
+	help
+	  Enable the wm8994 audio codec. This is connected via I2S for
+	  audio data and I2C for codec control. At present it only works
+	  with the Samsung I2S driver.
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 79a7adf..95e96ec 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -28,11 +28,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
 
-/* Sound */
-#ifdef CONFIG_CMD_SOUND
-#define CONFIG_SOUND_WM8994
-#endif
-
 /* I2C */
 #define CONFIG_MAX_I2C_NUM	8
 
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 13/14] sandbox: exynos: Move CONFIG_SOUND_WM8994 to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> Move this over to Kconfig and tidy up.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  configs/snow_defconfig              | 1 +
>  drivers/sound/Kconfig               | 8 ++++++++
>  include/configs/exynos5250-common.h | 5 -----
>  3 files changed, 9 insertions(+), 5 deletions(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 14/14] sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig

[Simon Glass]

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
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH 14/14] sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig

[Simon Glass]

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> 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(-)

Applied to u-boot-dm/next.

[U-Boot] [PATCH 0/14] sandbox: exynos: Move some (mostly) sandbox CONFIG options to Kconfig

[Simon Glass]

Hi,

On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote:
> These options relate to the sandbox drivers and also sound. There are still
> more options to move, but this is a start.
>
>
> Simon Glass (14):
>   sandbox: Move GPIO CONFIGs to Kconfig
>   sandbox: Move CONFIG_SYS_VSNPRINTF to Kconfig
>   sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig
>   sandbox: Move CONFIG_SYS_I2C_SANDBOX to Kconfig
>   sandbox: Move CONFIG_SANDBOX_SPI to Kconfig
>   sandbox: Move CONFIG_SPI_FLASH_SANDBOX to Kconfig
>   sandbox: Move CONFIG_TPM_TIS_SANDBOX to Kconfig
>   sandbox: exynos: Move CONFIG_SOUND to Kconfig
>   sandbox: exynos: Move CONFIG_CMD_SOUND to Kconfig
>   sandbox: exynos: Move CONFIG_I2S to Kconfig
>   sandbox: exynos: Move CONFIG_I2S_SAMSUNG to Kconfig
>   sandbox: exynos: Move CONFIG_SOUND_MAX98095 to Kconfig
>   sandbox: exynos: Move CONFIG_SOUND_WM8994 to Kconfig
>   sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig
>
>  arch/x86/Kconfig                    |  3 ++
>  common/Kconfig                      | 10 +++++++
>  configs/arndale_defconfig           |  5 ++++
>  configs/sandbox_defconfig           | 10 +++++++
>  configs/smdk5250_defconfig          |  5 ++++
>  configs/snow_defconfig              |  5 ++++
>  drivers/gpio/Kconfig                | 21 ++++++++++++++
>  drivers/i2c/Kconfig                 | 30 ++++++++++++++++++++
>  drivers/mtd/spi/Kconfig             | 10 +++++++
>  drivers/serial/Kconfig              | 20 ++++++++++++++
>  drivers/serial/serial-uclass.c      |  5 ++--
>  drivers/sound/Kconfig               | 55 +++++++++++++++++++++++++++++++++++++
>  drivers/spi/Kconfig                 | 25 +++++++++++++++++
>  drivers/tpm/Kconfig                 |  7 +++++
>  include/configs/exynos5250-common.h | 10 -------
>  include/configs/sandbox.h           | 16 -----------
>  include/configs/x86-common.h        |  1 -
>  include/fdtdec.h                    |  6 ++++
>  lib/Kconfig                         |  9 ++++++
>  19 files changed, 224 insertions(+), 29 deletions(-)

I'd like to apply this series to u-boot-dm/next. Are there any comments please?

Regards,
Simon