From eb091f03e3b05606e028df96931c8de5daeffe23 Mon Sep 17 00:00:00 2001
From: Marty Connor <mdc@etherboot.org>
Date: Thu, 29 Jun 2006 19:04:25 +0000
Subject: [PATCH] fix printf format args

---
 src/core/debug.c | 10 +++++-----
 src/core/image.c |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/debug.c b/src/core/debug.c
index 175a2f95..4b902c28 100644
--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -25,10 +25,10 @@ void hex_dump ( const char *data, const unsigned int len ) {
 			more();
 		}
 		if ( ( index % 16 ) == 0 ) {
-			printf ( "%X [%X] : %hX :", data + index,
+			printf ( "%p [%lX] : %X :", data + index,
 				 virt_to_phys ( data + index ), index );
 		}
-		printf ( " %hhX", data[index] );
+		printf ( " %02X", data[index] );
 	}
 	printf ( "\n" );
 }
@@ -64,19 +64,19 @@ int check_region ( void *region, size_t len ) {
 			/* Start of corruption */
 			if ( corrupted == 0 ) {
 				corrupted = 1;
-				printf ( "Region %#x-%#x (physical %#x-%#x) "
+				printf ( "Region %p-%p (physical %#lx-%#lx) "
 					 "corrupted\n",
 					 region, region + len,
 					 virt_to_phys ( region ),
 					 virt_to_phys ( region + len ) );
 			}
 			in_corruption = 1;
-			printf ( "--- offset %#x ", offset );
+			printf ( "--- offset %#lx ", offset );
 		} else if ( ( in_corruption != 0 ) &&
 			    ( test == GUARD_SYMBOL ) ) {
 			/* End of corruption */
 			in_corruption = 0;
-			printf ( "to offset %#x", offset );
+			printf ( "to offset %#lx", offset );
 		}
 
 	}
diff --git a/src/core/image.c b/src/core/image.c
index c60373c9..d8f96b53 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -2,6 +2,7 @@
 #include "buffer.h"
 #include "load_buffer.h"
 #include "image.h"
+#include <console.h>
 
 static struct image images[0] __image_start;
 static struct image images_end[0] __image_end;