Deleted Added
full compact
29c29
< __FBSDID("$FreeBSD: stable/10/sys/boot/uboot/lib/copy.c 283505 2015-05-25 01:06:55Z ian $");
---
> __FBSDID("$FreeBSD: stable/10/sys/boot/uboot/lib/copy.c 294685 2016-01-24 22:00:36Z ian $");
72,74c72,74
< uintptr_t sblock, eblock, subldr, eubldr;
< uintptr_t biggest_block, this_block;
< size_t biggest_size, this_size;
---
> uint64_t sblock, eblock, subldr, eubldr;
> uint64_t biggest_block, this_block;
> uint64_t biggest_size, this_size;
76c76
< char * envstr;
---
> char *envstr;
104c104
< eubldr = roundup2(uboot_heap_end, KERN_ALIGN);
---
> eubldr = roundup2((uint64_t)uboot_heap_end, KERN_ALIGN);
108,109c108
< sblock = roundup2(si->mr[i].start, KERN_ALIGN);
< eblock = rounddown2(si->mr[i].start + si->mr[i].size,
---
> sblock = roundup2((uint64_t)si->mr[i].start,
110a110,111
> eblock = rounddown2((uint64_t)si->mr[i].start +
> si->mr[i].size, KERN_ALIGN);
130,132c131,134
< printf("Loading kernel into region 0x%08x-0x%08x (%u MiB)\n",
< biggest_block, biggest_block + biggest_size - 1,
< biggest_size / 1024 / 1024);
---
> printf("Loading kernel into region 0x%08jx-0x%08jx (%ju MiB)\n",
> (uintmax_t)biggest_block,
> (uintmax_t)biggest_block + biggest_size - 1,
> (uintmax_t)biggest_size / 1024 / 1024);