sandbox: Move CONFIG_SPI_FLASH_SANDBOX to Kconfig

Move this over to Kconfig and tidy up.

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

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 058949a6a945efc575e2f2774c4908561554d13d..dd33028f8d7ff5f15e493aab2832bfb61ff2a8f6 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -21,3 +21,4 @@ CONFIG_SANDBOX_GPIO=y
 CONFIG_SYS_VSNPRINTF=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 fd2d7acbeabf28a55acc792d7ba00a4447def499..ac6d09f9286909e7698aea7994f7cd2eeaec045f 100644 (file)
--- 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/include/configs/sandbox.h b/include/configs/sandbox.h
index b77a866fea14b913136967c76db6e8f00b4d1a33..5f72f6a4c986fef3bb5f43f66ac06fc296449fa8 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -87,7 +87,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