diff --git a/elf_ops.h b/elf_ops.h
index 75cbdedda7..fe2ef9ba9a 100644
--- a/elf_ops.h
+++ b/elf_ops.h
@@ -145,8 +145,8 @@ int glue(load_elf, SZ)(int fd, int64_t virt_to_phys_addend,
     struct elfhdr ehdr;
     struct elf_phdr *phdr = NULL, *ph;
     int size, i, total_size;
-    elf_word low = 0, high = 0;
-    elf_word mem_size, addr;
+    elf_word mem_size;
+    target_phys_addr_t addr, low = 0, high = 0;
     uint8_t *data = NULL;
 
     if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))