summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-05-22 14:29:41 -0400
committerTom Rini <trini@ti.com>2014-05-22 14:29:41 -0400
commitf6ed9d50949eb290744bf7606e30763582e2d44b (patch)
tree659cd954a4b4075c7227ea6d1d6ec768b0a2d78a /common
parent8e3812859670fda61b98458864fa9f014fcd3dcc (diff)
parent05d134b084590684bcf4d832c0035952727b7cd9 (diff)
downloadblackbird-obmc-uboot-f6ed9d50949eb290744bf7606e30763582e2d44b.tar.gz
blackbird-obmc-uboot-f6ed9d50949eb290744bf7606e30763582e2d44b.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 9da021862e..062461b2b6 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -76,7 +76,7 @@ void spl_nand_load_image(void)
#endif
/* Load u-boot */
nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+ sizeof(*header), (void *)header);
spl_parse_image_header(header);
nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
spl_image.size, (void *)spl_image.load_addr);
OpenPOWER on IntegriCloud