projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a5eeb3f12c581e0f1d58792a250da16345e551c6..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)
{
#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,
&read_size, NULL,
-
nand_info[nand_curr_device]
->size,
+
mtd
->size,
(u_char *)bmp_load_addr);
}
#else
(u_char *)bmp_load_addr);
}
#else
@@
-162,7
+163,7
@@
static inline int splash_init_usb(void)
}
#endif
}
#endif
-#ifdef CONFIG_
CMD_
SATA
+#ifdef CONFIG_SATA
static int splash_init_sata(void)
{
return sata_initialize();
static int splash_init_sata(void)
{
return sata_initialize();
@@
-216,6
+217,7
@@
static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
{
int res = 0;
loff_t bmp_size;
{
int res = 0;
loff_t bmp_size;
+ loff_t actread;
char *splash_file;
splash_file = getenv("splashfile");
char *splash_file;
splash_file = getenv("splashfile");
@@
-251,7
+253,7
@@
static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
}
splash_select_fs_dev(location);
}
splash_select_fs_dev(location);
- res = fs_read(splash_file, bmp_load_addr, 0, 0,
NULL
);
+ res = fs_read(splash_file, bmp_load_addr, 0, 0,
&actread
);
out:
if (location->ubivol != NULL)
out:
if (location->ubivol != NULL)