From bf944970317820867895680cf0e2c4e72eefa8b1 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 31 Aug 2007 16:21:23 +1000 Subject: dtc: Optimise by default, fix warnings thus uncovered This patch turns on optimisation in the Makefile by default. With the optimizer on, some uninitialized variable warnings (one real, two bogus) are now generated. This patch also squashes those again. --- flattree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'flattree.c') diff --git a/flattree.c b/flattree.c index 5b15e9c..e857b08 100644 --- a/flattree.c +++ b/flattree.c @@ -909,6 +909,7 @@ struct boot_info *dt_from_blob(FILE *f) fprintf(stderr, "\tboot_cpuid_phys:\t0x%x\n", be32_to_cpu(bph->boot_cpuid_phys)); + size_str = -1; if (version >= 3) { size_str = be32_to_cpu(bph->size_dt_strings); fprintf(stderr, "\tsize_dt_strings:\t%d\n", size_str); @@ -932,10 +933,10 @@ struct boot_info *dt_from_blob(FILE *f) inbuf_init(&memresvbuf, blob + off_mem_rsvmap, blob + totalsize); inbuf_init(&dtbuf, blob + off_dt, blob + totalsize); - inbuf_init(&strbuf, blob + off_str, blob + totalsize); - - if (version >= 3) - strbuf.limit = strbuf.base + size_str; + if (size_str >= 0) + inbuf_init(&strbuf, blob + off_str, blob + off_str + size_str); + else + inbuf_init(&strbuf, blob + off_str, blob + totalsize); reservelist = flat_read_mem_reserve(&memresvbuf); -- cgit v1.2.1