Merge branch 'master' of git://git.denx.de/u-boot-spi

2014-08-05 17:16:16 -04:00
parent dcdb61a084 f659b57361
commit 336450f5fc
7 changed files with 31 additions and 8 deletions
--- a/4
+++ b/4
@@ -2597,6 +2597,10 @@ CBFS (Coreboot Filesystem) support
 		Enables the driver for the SPI controllers on i.MX and MXC
 		SoCs. Currently i.MX31/35/51 are supported.

+		CONFIG_SYS_SPI_MXC_WAIT
+		Timeout for waiting until spi transfer completed.
+		default: (CONFIG_SYS_HZ/100)     /* 10 ms */
+
 - FPGA Support: CONFIG_FPGA

 		Enables FPGA subsystem.