aboutsummaryrefslogtreecommitdiff
path: root/scripts/dtc/util.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-09-23 17:30:53 -0400
committerTom Rini <trini@konsulko.com>2017-09-23 17:33:06 -0400
commitd6fc90ced42e9fb77185cedfe45d0a2c7ac78508 (patch)
tree3f3e4982f1e5ab73569913be730c2fe9286a1b63 /scripts/dtc/util.c
parentc0e032e0090d6541549b19cc47e06ccd1f302893 (diff)
downloadu-boot-d6fc90ced42e9fb77185cedfe45d0a2c7ac78508.zip
u-boot-d6fc90ced42e9fb77185cedfe45d0a2c7ac78508.tar.gz
u-boot-d6fc90ced42e9fb77185cedfe45d0a2c7ac78508.tar.bz2
scripts/dtc: Update to upstream version v1.4.4
This adds the following commits from upstream: 558cd81bdd43 dtc: Bump version to v1.4.4 c17a811c62eb fdtput: Remove star from value_len documentation 194d5caaefcb fdtget: Use @return to document the return value d922ecdd017b tests: Make realloc_fdt() really allocate *fdt 921cc17fec29 libfdt: overlay: Check the value of the right variable 9ffdf60bf463 dtc: Simplify asm_emit_string() implementation 881012e44386 libfdt: Change names of sparse helper macros bad5b28049e5 Fix assorted sparse warnings 672ac09ea04d Clean up gcc attributes 49300f2ade6a dtc: Don't abuse struct fdt_reserve_entry Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts/dtc/util.c')
-rw-r--r--scripts/dtc/util.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index 3550f86..9953c32 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -396,7 +396,7 @@ void utilfdt_print_data(const char *data, int len)
} while (s < data + len);
} else if ((len % 4) == 0) {
- const uint32_t *cell = (const uint32_t *)data;
+ const fdt32_t *cell = (const fdt32_t *)data;
printf(" = <");
for (i = 0, len /= 4; i < len; i++)
@@ -412,15 +412,16 @@ void utilfdt_print_data(const char *data, int len)
}
}
-void util_version(void)
+void NORETURN util_version(void)
{
printf("Version: %s\n", DTC_VERSION);
exit(0);
}
-void util_usage(const char *errmsg, const char *synopsis,
- const char *short_opts, struct option const long_opts[],
- const char * const opts_help[])
+void NORETURN util_usage(const char *errmsg, const char *synopsis,
+ const char *short_opts,
+ struct option const long_opts[],
+ const char * const opts_help[])
{
FILE *fp = errmsg ? stderr : stdout;
const char a_arg[] = "<arg>";