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

This commit is contained in:
Tom Rini
2016-07-11 18:50:29 -04:00
23 changed files with 464 additions and 131 deletions
+2
View File
@@ -88,6 +88,8 @@ static int do_spi_flash_probe(int argc, char * const argv[])
#ifdef CONFIG_DM_SPI_FLASH
struct udevice *new, *bus_dev;
int ret;
/* In DM mode defaults will be taken from DT */
speed = 0, mode = 0;
#else
struct spi_flash *new;
#endif