aboutsummaryrefslogtreecommitdiff
path: root/board/cm_t35/cm_t35.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-04-11 14:31:50 -0400
committerTom Rini <trini@ti.com>2013-04-11 14:31:50 -0400
commit980464a4fc6d69c080ea02115f05694efe313cd8 (patch)
tree537e97f4cbe77ed65b56ffeafe1d50031c1771cb /board/cm_t35/cm_t35.c
parentfac150e83f403933e9ffc9d01f858c4a6313874e (diff)
parentdda48e8efff878e51e986befd9c6c3780b4757a7 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board/cm_t35/cm_t35.c')
-rw-r--r--board/cm_t35/cm_t35.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 629ce4a505..84c36bafb4 100644
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -91,6 +91,7 @@ static int splash_load_from_nand(u32 bmp_load_addr)
res = nand_read_skip_bad(&nand_info[nand_curr_device],
splash_screen_nand_offset, &bmp_header_size,
+ NULL, nand_info[nand_curr_device].size,
(u_char *)bmp_load_addr);
if (res < 0)
return res;
@@ -103,6 +104,7 @@ static int splash_load_from_nand(u32 bmp_load_addr)
return nand_read_skip_bad(&nand_info[nand_curr_device],
splash_screen_nand_offset, &bmp_size,
+ NULL, nand_info[nand_curr_device].size,
(u_char *)bmp_load_addr);
splash_address_too_high: