diff options
| author | Tom Rini <trini@ti.com> | 2014-09-26 20:10:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-26 20:10:48 -0400 |
| commit | be9f643ae6aa9044c60fe80e3a2c10be8371c692 (patch) | |
| tree | b0b2226a1bf2e382257c56165d4c1269b057980b /include | |
| parent | 2c2277f15cbaa9533ef8aead7328c3f605251147 (diff) | |
| parent | 248a0488bfbb2eb16dee408a976d5f4b5546bb51 (diff) | |
| download | blackbird-obmc-uboot-be9f643ae6aa9044c60fe80e3a2c10be8371c692.tar.gz blackbird-obmc-uboot-be9f643ae6aa9044c60fe80e3a2c10be8371c692.zip | |
Merge branch 'for-tom' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sandbox.h | 8 | ||||
| -rw-r--r-- | include/spi.h | 24 |
2 files changed, 19 insertions, 13 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5d364164c0..69726432a3 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 ffd66478b1..b673be270c 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 |
