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

* 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@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;

I've already added a prototype to ft_build.h for ft_board_setup().
- k
On Jan 17, 2006, at 11:28 AM, Jon Loeliger wrote:
- 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@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);
break; case 2: /* half-word */printf(" = <%02x>", (*(u8 *) data) & 0xff);
printf(" = <0x%04x>", be16_to_cpu(*(u16 *) data) & 0xffff);
break; case 4: /* word */printf(" = <%04x>", be16_to_cpu(*(u16 *) data) & 0xffff);
printf(" = <0x%08x>", be32_to_cpu(*(u32 *) data) & 0xffffffffU);
break; case 8: /* double-word */printf(" = <%x>", be32_to_cpu(*(u32 *) data) & 0xffffffffU);
printf(" = <0x%16llx>", be64_to_cpu(*(uint64_t *) data));
break; default: /* anything else... hexdump */ printf(" = [");printf(" = <%qx>", be64_to_cpu(*(uint64_t *) data));
@@ -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;
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel? cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users

On Tue, 2006-01-17 at 11:39, Kumar Gala wrote:
I've already added a prototype to ft_build.h for ft_board_setup().
- k
Argh. So you want a new patch here? Or can you apply my patch and forget to check in thse three lines I added?
#ifdef CONFIG_OF_BOARD_SETUP void ft_board_setup(void *blob, bd_t *bd); #endif
Thanks, jdl
participants (2)
-
Jon Loeliger
-
Kumar Gala