summaryrefslogtreecommitdiffstats
path: root/common/spl
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-03-24 13:25:02 -0700
committerYork Sun <yorksun@freescale.com>2015-04-23 16:46:50 -0700
commitb2d5ac59859fa946e47fb6ab1f4f3486d4988680 (patch)
tree6c148fbcd0a66138d4d98dcf050df44d24fbef06 /common/spl
parent39b0bbbb23076a7109eeb20b6ae812edcd60ffc2 (diff)
downloadtalos-obmc-uboot-b2d5ac59859fa946e47fb6ab1f4f3486d4988680.tar.gz
talos-obmc-uboot-b2d5ac59859fa946e47fb6ab1f4f3486d4988680.zip
armv8/ls2085aqds: NAND boot support
This adds NAND boot support for LS2085AQDS, using SPL framework. Details of forming NAND image can be found in README. Signed-off-by: Scott Wood <scottwood@freescale.com> [York Sun: Remove +S from defconfig after commit 252ed872] Signed-off-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/spl.c2
-rw-r--r--common/spl/spl_nand.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 8e1fb40c47..10b5564973 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -125,7 +125,7 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
typedef void __noreturn (*image_entry_noargs_t)(void);
image_entry_noargs_t image_entry =
- (image_entry_noargs_t) spl_image->entry_point;
+ (image_entry_noargs_t)(unsigned long)spl_image->entry_point;
debug("image entry point: 0x%X\n", spl_image->entry_point);
image_entry();
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index b7801cb460..b8c369d984 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -91,7 +91,7 @@ void spl_nand_load_image(void)
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);
+ spl_image.size, (void *)(unsigned long)spl_image.load_addr);
nand_deselect();
}
#endif
OpenPOWER on IntegriCloud