summaryrefslogtreecommitdiffstats
path: root/scripts/dtc/util.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-03-21 10:01:08 -0400
committerRob Herring <robh@kernel.org>2017-03-22 15:56:14 -0400
commit89d123106a97bf412a4c10482044c822f4b069f7 (patch)
tree35603f528aedddff67a643b957f2803601a03f95 /scripts/dtc/util.c
parent86cef6144d273404d8cb5c0b215ada8d23e5dbeb (diff)
scripts/dtc: Update to upstream version v1.4.4-8-g756ffc4f52f6
This adds the following commits from upstream: 756ffc4f52f6 Build pylibfdt as part of the normal build process 8cb3896358e9 Adjust libfdt.h to work with swig b40aa8359aff Mention pylibfdt in the documentation 12cfb740cc76 Add tests for pylibfdt 50f250701631 Add an initial Python library for libfdt cdbb2b6c7a3a checks: Warn on node name unit-addresses with '0x' or leading 0s 4c15d5da17cc checks: Add bus checks for simple-bus buses 33c3985226d3 checks: Add bus checks for PCI buses 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 fa8bc7f928ac dtc: Bump version to v1.4.3 34a9886a177f Add printf format attributes f72508e2b6ca Correct some broken printf() like format mismatches 397d5ef0203c libfdt: Add fdt_setprop_empty() 69a1bd6ad3f9 libfdt: Remove undefined behaviour setting empty properties acd1b534a592 Print output filename as part of warning messages 120775eb1cf3 dtc: Use streq() in preference to strcmp() 852e9ecbe197 checks: Add Warning for stricter node name character checking ef0e8f061534 checks: Add Warning for stricter property name character checking 00d7bb1f4b0e dtc: pos parameter to srcpos_string() can't be NULL 95d57726bca4 livetree.c: Fix memory leak 3b9c97093d6e dtc: Fix NULL pointer use in dtlabel + dtref case 43eb551426ea manual: Fix typo it -> in 4baf15f7f13f Makefile: Add tags rule Signed-off-by: Rob Herring <robh@kernel.org>
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 3550f86bd6df..9953c32a0244 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -396,7 +396,7 @@ void utilfdt_print_data(const char *data, int len)
396 } while (s < data + len); 396 } while (s < data + len);
397 397
398 } else if ((len % 4) == 0) { 398 } else if ((len % 4) == 0) {
399 const uint32_t *cell = (const uint32_t *)data; 399 const fdt32_t *cell = (const fdt32_t *)data;
400 400
401 printf(" = <"); 401 printf(" = <");
402 for (i = 0, len /= 4; i < len; i++) 402 for (i = 0, len /= 4; i < len; i++)
@@ -412,15 +412,16 @@ void utilfdt_print_data(const char *data, int len)
412 } 412 }
413} 413}
414 414
415void util_version(void) 415void NORETURN util_version(void)
416{ 416{
417 printf("Version: %s\n", DTC_VERSION); 417 printf("Version: %s\n", DTC_VERSION);
418 exit(0); 418 exit(0);
419} 419}
420 420
421void util_usage(const char *errmsg, const char *synopsis, 421void NORETURN util_usage(const char *errmsg, const char *synopsis,
422 const char *short_opts, struct option const long_opts[], 422 const char *short_opts,
423 const char * const opts_help[]) 423 struct option const long_opts[],
424 const char * const opts_help[])
424{ 425{
425 FILE *fp = errmsg ? stderr : stdout; 426 FILE *fp = errmsg ? stderr : stdout;
426 const char a_arg[] = "<arg>"; 427 const char a_arg[] = "<arg>";