usb: xhci: Change MAX_HC_PORTS to 255

[oweals/u-boot.git] / common / splash_source.c

diff --git a/common/splash_source.c b/common/splash_source.c
index d1647c8300629d529444f2b053ac53e5735525e2..867a7984870ddeae0e167d55911627f846ae7783 100644 (file)
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -47,9 +47,10 @@ static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
 #ifdef CONFIG_CMD_NAND
 static int splash_nand_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
 {
-       return nand_read_skip_bad(nand_info[nand_curr_device], offset,
+       struct mtd_info *mtd = get_nand_dev_by_index(nand_curr_device);
+       return nand_read_skip_bad(mtd, offset,
                                  &read_size, NULL,
-                                 nand_info[nand_curr_device]->size,
+                                 mtd->size,
                                  (u_char *)bmp_load_addr);
 }
 #else
@@ -162,7 +163,7 @@ static inline int splash_init_usb(void)
 }
 #endif
 
-#ifdef CONFIG_CMD_SATA
+#ifdef CONFIG_SATA
 static int splash_init_sata(void)
 {
        return sata_initialize();