summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/sandbox.h8
-rw-r--r--include/spi.h24
2 files changed, 19 insertions, 13 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 5d36416..6972643 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -91,7 +91,7 @@
#define CONFIG_ENV_SIZE 8192
#define CONFIG_ENV_IS_NOWHERE
-/* SPI */
+/* SPI - enable all SPI flash types for testing purposes */
#define CONFIG_SANDBOX_SPI
#define CONFIG_CMD_SF
#define CONFIG_CMD_SF_TEST
@@ -99,7 +99,13 @@
#define CONFIG_SPI_FLASH
#define CONFIG_OF_SPI
#define CONFIG_OF_SPI_FLASH
+#define CONFIG_SPI_FLASH_ATMEL
+#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
#define CONFIG_SPI_FLASH_WINBOND
diff --git a/include/spi.h b/include/spi.h
index ffd6647..b673be2 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -30,24 +30,24 @@
#define SPI_XFER_MMAP 0x08 /* Memory Mapped start */
#define SPI_XFER_MMAP_END 0x10 /* Memory Mapped End */
#define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END)
-#define SPI_XFER_U_PAGE (1 << 5)
+#define SPI_XFER_U_PAGE (1 << 5)
/* SPI TX operation modes */
-#define SPI_OPM_TX_QPP 1 << 0
+#define SPI_OPM_TX_QPP (1 << 0)
/* SPI RX operation modes */
-#define SPI_OPM_RX_AS 1 << 0
-#define SPI_OPM_RX_DOUT 1 << 1
-#define SPI_OPM_RX_DIO 1 << 2
-#define SPI_OPM_RX_QOF 1 << 3
-#define SPI_OPM_RX_QIOF 1 << 4
-#define SPI_OPM_RX_EXTN SPI_OPM_RX_AS | SPI_OPM_RX_DOUT | \
+#define SPI_OPM_RX_AS (1 << 0)
+#define SPI_OPM_RX_DOUT (1 << 1)
+#define SPI_OPM_RX_DIO (1 << 2)
+#define SPI_OPM_RX_QOF (1 << 3)
+#define SPI_OPM_RX_QIOF (1 << 4)
+#define SPI_OPM_RX_EXTN (SPI_OPM_RX_AS | SPI_OPM_RX_DOUT | \
SPI_OPM_RX_DIO | SPI_OPM_RX_QOF | \
- SPI_OPM_RX_QIOF
+ SPI_OPM_RX_QIOF)
-/* SPI bus connection options */
-#define SPI_CONN_DUAL_SHARED 1 << 0
-#define SPI_CONN_DUAL_SEPARATED 1 << 1
+/* SPI bus connection options - see enum spi_dual_flash */
+#define SPI_CONN_DUAL_SHARED (1 << 0)
+#define SPI_CONN_DUAL_SEPARATED (1 << 1)
/* Header byte that marks the start of the message */
#define SPI_PREAMBLE_END_BYTE 0xec