diff options
author | Michal Simek <michal.simek@xilinx.com> | 2016-04-27 16:07:20 +0200 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2016-07-22 14:03:54 +0200 |
commit | 1eefe14f66c982bf7145e9d3b57fafd1f17fe12f (patch) | |
tree | 019612e2ae8c5b71cb181b120db98752946565bf | |
parent | 1d405e207bb176c937d44f9a5f87e268022c2416 (diff) | |
download | u-boot-imx-1eefe14f66c982bf7145e9d3b57fafd1f17fe12f.zip u-boot-imx-1eefe14f66c982bf7145e9d3b57fafd1f17fe12f.tar.gz u-boot-imx-1eefe14f66c982bf7145e9d3b57fafd1f17fe12f.tar.bz2 |
spl: Fix compilation warnings for arm64
Make code 64bit aware.
Warnings:
+../arch/arm/lib/spl.c: In function ‘jump_to_image_linux’:
+../arch/arm/lib/spl.c:63:3: warning: cast to pointer from integer of
different size [-Wint-to-pointer-cast]
+../common/spl/spl_fat.c: In function ‘spl_load_image_fat’:
+../common/spl/spl_fat.c:91:33: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | arch/arm/lib/spl.c | 2 | ||||
-rw-r--r-- | common/spl/spl_fat.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index e428868..c1b8534 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -60,7 +60,7 @@ void __noreturn jump_to_image_linux(void *arg) typedef void (*image_entry_arg_t)(int, int, void *) __attribute__ ((noreturn)); image_entry_arg_t image_entry = - (image_entry_arg_t) spl_image.entry_point; + (image_entry_arg_t)(uintptr_t) spl_image.entry_point; cleanup_before_linux(); image_entry(0, machid, arg); } diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index db67618..73d33f5 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -88,7 +88,8 @@ int spl_load_image_fat(struct blk_desc *block_dev, if (err) goto end; - err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0); + err = file_fat_read(filename, + (u8 *)(uintptr_t)spl_image.load_addr, 0); } end: |