summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2012-09-16 06:55:06 +0000
committerTom Rini <trini@ti.com>2012-10-15 11:53:46 -0700
commitb0d60a981230a1ebfc10387702894a8d85a0e686 (patch)
treecadef64bafa9231cfde473f90aa18266864180a3 /common
parent62e03d33c91ab2f8b4bc8a75e3f4796e65fd07a2 (diff)
downloadu-boot-imx-b0d60a981230a1ebfc10387702894a8d85a0e686.zip
u-boot-imx-b0d60a981230a1ebfc10387702894a8d85a0e686.tar.gz
u-boot-imx-b0d60a981230a1ebfc10387702894a8d85a0e686.tar.bz2
common: cmd_elf.c: use uintptr_t for casts from u32 to void*
This fixes warnings when compiling with ELDK-5.2.1 for MIPS64: cmd_elf.c: In function 'load_elf_image_phdr': cmd_elf.c:289:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] cmd_elf.c: In function 'load_elf_image_shdr': cmd_elf.c:343:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] cmd_elf.c:346:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_elf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 970426f..a667a46 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -284,7 +284,7 @@ static unsigned long load_elf_image_phdr(unsigned long addr)
/* Load each program header */
for (i = 0; i < ehdr->e_phnum; ++i) {
- void *dst = (void *) phdr->p_paddr;
+ void *dst = (void *)(uintptr_t) phdr->p_paddr;
void *src = (void *) addr + phdr->p_offset;
debug("Loading phdr %i to 0x%p (%i bytes)\n",
i, dst, phdr->p_filesz);
@@ -339,10 +339,11 @@ static unsigned long load_elf_image_shdr(unsigned long addr)
}
if (shdr->sh_type == SHT_NOBITS) {
- memset((void *)shdr->sh_addr, 0, shdr->sh_size);
+ memset((void *)(uintptr_t) shdr->sh_addr, 0,
+ shdr->sh_size);
} else {
image = (unsigned char *) addr + shdr->sh_offset;
- memcpy((void *) shdr->sh_addr,
+ memcpy((void *)(uintptr_t) shdr->sh_addr,
(const void *) image,
shdr->sh_size);
}