summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-18 08:25:24 -0400
committerTom Rini <trini@konsulko.com>2015-08-18 08:25:24 -0400
commit952bd79b53f002740634977edfc0c4d744908032 (patch)
tree05265bd4b6b304b3c8089bda9f2e1f60db534772 /include
parent783983f323730540f861413dfbea6802c88afcf8 (diff)
parentfc5e22008a668a75d108ebf8edc93849c6f9dcb4 (diff)
downloadtalos-obmc-uboot-952bd79b53f002740634977edfc0c4d744908032.tar.gz
talos-obmc-uboot-952bd79b53f002740634977edfc0c4d744908032.zip
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include')
-rw-r--r--include/configs/dra7xx_evm.h2
-rw-r--r--include/spi.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 74994479e6..6e32de8546 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -166,6 +166,8 @@
/* SPI SPL */
#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_DMA_SUPPORT
+#define CONFIG_TI_EDMA3
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
diff --git a/include/spi.h b/include/spi.h
index 18362364cf..51fdfd6d73 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -272,6 +272,9 @@ int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen);
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
void *din, unsigned long flags);
+/* Copy memory mapped data */
+void spi_flash_copy_mmap(void *data, void *offset, size_t len);
+
/**
* Determine if a SPI chipselect is valid.
* This function is provided by the board if the low-level SPI driver
OpenPOWER on IntegriCloud