diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-01 16:05:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-01 16:05:51 +0100 |
| commit | 17380cb04d510ad1a6983e6d448d2520d444b66a (patch) | |
| tree | ad9375511bb8662d9d6acea24f1d09e9010c350a | |
| parent | 4cc64742a89e8ce90c69c3c85e4e9f4706062f2f (diff) | |
| parent | 4bc7deee9095f21e243b724ca3d634251c1d5432 (diff) | |
| download | u-boot-imx-17380cb04d510ad1a6983e6d448d2520d444b66a.zip u-boot-imx-17380cb04d510ad1a6983e6d448d2520d444b66a.tar.gz u-boot-imx-17380cb04d510ad1a6983e6d448d2520d444b66a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
| -rw-r--r-- | common/fdt_support.c | 7 | ||||
| -rw-r--r-- | libfdt/fdt_ro.c | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index d483d66..5a83bca 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -602,9 +602,12 @@ int fdt_resize(void *blob) } } - /* Calculate the actual size of the fdt */ + /* + * Calculate the actual size of the fdt + * plus the size needed for fdt_add_mem_rsv + */ actualsize = fdt_off_dt_strings(blob) + - fdt_size_dt_strings(blob); + fdt_size_dt_strings(blob) + sizeof(struct fdt_reserve_entry); /* Make it so the fdt ends on a page boundary */ actualsize = ALIGN(actualsize, 0x1000); diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index b705f91..fdc9c29 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -112,12 +112,12 @@ int fdt_num_mem_rsv(const void *fdt) int fdt_subnode_offset_namelen(const void *fdt, int offset, const char *name, int namelen) { - int depth; + int depth = 0; FDT_CHECK_HEADER(fdt); - for (depth = 0; - offset >= 0; + for (depth = 0, offset = fdt_next_node(fdt, offset, &depth); + (offset >= 0) && (depth > 0); offset = fdt_next_node(fdt, offset, &depth)) { if (depth < 0) return -FDT_ERR_NOTFOUND; @@ -126,7 +126,10 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset, return offset; } - return offset; /* error */ + if (offset < 0) + return offset; /* error */ + else + return -FDT_ERR_NOTFOUND; } int fdt_subnode_offset(const void *fdt, int parentoffset, |