diff options
| author | Simon Glass <sjg@chromium.org> | 2014-07-30 03:59:02 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-09 11:17:03 -0400 |
| commit | 5bf58ccc8ebd5270f64a20c4c54c98a96acbd7ed (patch) | |
| tree | 3da0e9d970dfd6f343be9249a96e4ac2f35e3b9f /common | |
| parent | 0b6cc51e988862eb6c521b45ae09cc97ce709f42 (diff) | |
fdt: Rename fdt_resize() to fdt_shrink_to_minimum()
Since libfdt now has an fdt_resize() function, we need to rename the
U-Boot one.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_fdt.c | 2 | ||||
| -rw-r--r-- | common/fdt_support.c | 2 | ||||
| -rw-r--r-- | common/image-fdt.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index e86d992838e..5640ded2968 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -621,7 +621,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } /* resize the fdt */ else if (strncmp(argv[1], "re", 2) == 0) { - fdt_resize(working_fdt); + fdt_shrink_to_minimum(working_fdt); } else { /* Unrecognized command */ diff --git a/common/fdt_support.c b/common/fdt_support.c index 7927a83b896..784a570a818 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -508,7 +508,7 @@ void fdt_fixup_ethernet(void *fdt) } /* Resize the fdt to its actual size + a bit of padding */ -int fdt_resize(void *blob) +int fdt_shrink_to_minimum(void *blob) { int i; uint64_t addr, size; diff --git a/common/image-fdt.c b/common/image-fdt.c index db6e3955627..a2342fa3dfd 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -479,7 +479,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob, (phys_size_t)fdt_totalsize(blob)); - ret = fdt_resize(blob); + ret = fdt_shrink_to_minimum(blob); if (ret < 0) return ret; of_size = ret; |