[U-Boot-Users] [PATCH 02/04] Fix Flat Dev prototypes and print formatting

[Jon Loeliger]

* Add protoype for ft_board_setup() in ft_build.h as needed.
  Fix Flat Dev tree printf formats for quad-sized values.
  Patch by Jon Loeliger 17-Jan-2006


Signed-off-by: Jon Loeliger <jdl at freescale.com>

---

 include/ft_build.h |    4 ++++
 common/ft_build.c  |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


diff --git a/include/ft_build.h b/include/ft_build.h
--- a/include/ft_build.h
+++ b/include/ft_build.h
@@ -59,6 +59,10 @@ void ft_add_rsvmap(struct ft_cxt *cxt, u
 
 void ft_setup(void *blob, int size, bd_t * bd, ulong initrd_start, ulong initrd_end);
 
+#ifdef CONFIG_OF_BOARD_SETUP
+void ft_board_setup(void *blob, bd_t *bd);
+#endif
+
 void ft_dump_blob(const void *bphp);
 void ft_merge_blob(struct ft_cxt *cxt, void *blob);
 void *ft_get_prop(void *bphp, const char *propname, int *szp);
diff --git a/common/ft_build.c b/common/ft_build.c
index 6e4d3de..5fa052d 100644
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -299,16 +299,16 @@ static void print_data(const void *data,
 
 	switch (len) {
 	case 1:		/* byte */
-		printf(" = <0x%02x>", (*(u8 *) data) & 0xff);
+		printf(" = <%02x>", (*(u8 *) data) & 0xff);
 		break;
 	case 2:		/* half-word */
-		printf(" = <0x%04x>", be16_to_cpu(*(u16 *) data) & 0xffff);
+		printf(" = <%04x>", be16_to_cpu(*(u16 *) data) & 0xffff);
 		break;
 	case 4:		/* word */
-		printf(" = <0x%08x>", be32_to_cpu(*(u32 *) data) & 0xffffffffU);
+		printf(" = <%x>", be32_to_cpu(*(u32 *) data) & 0xffffffffU);
 		break;
 	case 8:		/* double-word */
-		printf(" = <0x%16llx>", be64_to_cpu(*(uint64_t *) data));
+		printf(" = <%qx>", be64_to_cpu(*(uint64_t *) data));
 		break;
 	default:		/* anything else... hexdump */
 		printf(" = [");
@@ -350,8 +350,8 @@ void ft_dump_blob(const void *bphp)
 		if (addr == 0 && size == 0)
 			break;
 
-		printf("/memreserve/ 0x%llx 0x%llx;\n", addr, size);
+		printf("/memreserve/ %qx %qx;\n", addr, size);
 	}
 
 	p = p_struct;