summaryrefslogtreecommitdiff
path: root/lib_generic/lmb.c
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2008-07-21 12:37:56 +0200
committerMarkus Klotzbuecher <mk@denx.de>2008-07-21 12:37:56 +0200
commitab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (patch)
tree5df2528b42f073dd5bbb34b14f288a1811073729 /lib_generic/lmb.c
parent262423955895ba4599fa11d7c49dcffb65af0afd (diff)
parent1953d128fd07f07d1c3810a28c0863ea64dae1b6 (diff)
downloadu-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.zip
u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.gz
u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'lib_generic/lmb.c')
-rw-r--r--lib_generic/lmb.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/lib_generic/lmb.c b/lib_generic/lmb.c
index 6b46fa8..1c6cf7c 100644
--- a/lib_generic/lmb.c
+++ b/lib_generic/lmb.c
@@ -25,19 +25,21 @@ void lmb_dump_all(struct lmb *lmb)
debug(" memory.size = 0x%llx\n",
(unsigned long long)lmb->memory.size);
for (i=0; i < lmb->memory.cnt ;i++) {
- debug(" memory.reg[0x%x].base = 0x%llx\n", i,
- lmb->memory.region[i].base);
+ debug(" memory.reg[0x%lx].base = 0x%llx\n", i,
+ (long long unsigned)lmb->memory.region[i].base);
debug(" .size = 0x%llx\n",
- lmb->memory.region[i].size);
+ (long long unsigned)lmb->memory.region[i].size);
}
- debug("\n reserved.cnt = 0x%lx\n", lmb->reserved.cnt);
- debug(" reserved.size = 0x%llx\n", lmb->reserved.size);
+ debug("\n reserved.cnt = 0x%lx\n",
+ lmb->reserved.cnt);
+ debug(" reserved.size = 0x%llx\n",
+ (long long unsigned)lmb->reserved.size);
for (i=0; i < lmb->reserved.cnt ;i++) {
- debug(" reserved.reg[0x%x].base = 0x%llx\n", i,
- lmb->reserved.region[i].base);
+ debug(" reserved.reg[0x%lx].base = 0x%llx\n", i,
+ (long long unsigned)lmb->reserved.region[i].base);
debug(" .size = 0x%llx\n",
- lmb->reserved.region[i].size);
+ (long long unsigned)lmb->reserved.region[i].size);
}
#endif /* DEBUG */
}
@@ -266,7 +268,7 @@ phys_addr_t lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align, phys_
if (alloc == 0)
printf("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
- size, max_addr);
+ (ulong)size, (ulong)max_addr);
return alloc;
}