Merge branch 'master' of git://www.denx.de/git/u-boot

2 files changed, 20 insertions, 12 deletions

diff --git a/lib_generic/lmb.c b/lib_generic/lmb.c
index 6b46fa88684..1c6cf7ce000 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;
 }
diff --git a/lib_generic/vsprintf.c b/lib_generic/vsprintf.c
index 3db6c3f936c..7c9cfe16cef 100644
--- a/lib_generic/vsprintf.c
+++ b/lib_generic/vsprintf.c
@@ -262,7 +262,9 @@ int vsprintf(char *buf, const char *fmt, va_list args)
 
 		/* get the conversion qualifier */
 		qualifier = -1;
-		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'q') {
+		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
+		    *fmt == 'Z' || *fmt == 'z' || *fmt == 't' ||
+		    *fmt == 'q' ) {
 			qualifier = *fmt;
 			if (qualifier == 'l' && *(fmt+1) == 'l') {
 				qualifier = 'q';
@@ -355,9 +357,13 @@ int vsprintf(char *buf, const char *fmt, va_list args)
 			num = va_arg(args, unsigned long long);
 		else
 #endif
-		if (qualifier == 'l')
+		if (qualifier == 'l') {
 			num = va_arg(args, unsigned long);
-		else if (qualifier == 'h') {
+		} else if (qualifier == 'Z' || qualifier == 'z') {
+			num = va_arg(args, size_t);
+		} else if (qualifier == 't') {
+			num = va_arg(args, ptrdiff_t);
+		} else if (qualifier == 'h') {
 			num = (unsigned short) va_arg(args, int);
 			if (flags & SIGN)
 				num = (short) num;