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

This commit is contained in:
Tom Rini 2017-08-18 18:24:36 -04:00
commit 1fdafb2e3d
67 changed files with 1520 additions and 1045 deletions

View file

@ -166,7 +166,7 @@ static inline int splash_init_usb(void)
#ifdef CONFIG_SATA
static int splash_init_sata(void)
{
return sata_initialize();
return sata_probe(0);
}
#else
static inline int splash_init_sata(void)