summaryrefslogtreecommitdiffstats
path: root/scripts/dtc/livetree.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/livetree.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/livetree.c')
-rw-r--r--scripts/dtc/livetree.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index afa2f67b142a..3673de07e4e5 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -242,7 +242,7 @@ void delete_property_by_name(struct node *node, char *name)
242 struct property *prop = node->proplist; 242 struct property *prop = node->proplist;
243 243
244 while (prop) { 244 while (prop) {
245 if (!strcmp(prop->name, name)) { 245 if (streq(prop->name, name)) {
246 delete_property(prop); 246 delete_property(prop);
247 return; 247 return;
248 } 248 }
@@ -275,7 +275,7 @@ void delete_node_by_name(struct node *parent, char *name)
275 struct node *node = parent->children; 275 struct node *node = parent->children;
276 276
277 while (node) { 277 while (node) {
278 if (!strcmp(node->name, name)) { 278 if (streq(node->name, name)) {
279 delete_node(node); 279 delete_node(node);
280 return; 280 return;
281 } 281 }
@@ -319,8 +319,8 @@ struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size)
319 319
320 memset(new, 0, sizeof(*new)); 320 memset(new, 0, sizeof(*new));
321 321
322 new->re.address = address; 322 new->address = address;
323 new->re.size = size; 323 new->size = size;
324 324
325 return new; 325 return new;
326} 326}
@@ -393,7 +393,7 @@ struct property *get_property(struct node *node, const char *propname)
393cell_t propval_cell(struct property *prop) 393cell_t propval_cell(struct property *prop)
394{ 394{
395 assert(prop->val.len == sizeof(cell_t)); 395 assert(prop->val.len == sizeof(cell_t));
396 return fdt32_to_cpu(*((cell_t *)prop->val.val)); 396 return fdt32_to_cpu(*((fdt32_t *)prop->val.val));
397} 397}
398 398
399struct property *get_property_by_label(struct node *tree, const char *label, 399struct property *get_property_by_label(struct node *tree, const char *label,
@@ -599,13 +599,13 @@ static int cmp_reserve_info(const void *ax, const void *bx)
599 a = *((const struct reserve_info * const *)ax); 599 a = *((const struct reserve_info * const *)ax);
600 b = *((const struct reserve_info * const *)bx); 600 b = *((const struct reserve_info * const *)bx);
601 601
602 if (a->re.address < b->re.address) 602 if (a->address < b->address)
603 return -1; 603 return -1;
604 else if (a->re.address > b->re.address) 604 else if (a->address > b->address)
605 return 1; 605 return 1;
606 else if (a->re.size < b->re.size) 606 else if (a->size < b->size)
607 return -1; 607 return -1;
608 else if (a->re.size > b->re.size) 608 else if (a->size > b->size)
609 return 1; 609 return 1;
610 else 610 else
611 return 0; 611 return 0;
@@ -847,6 +847,8 @@ static void add_fixup_entry(struct dt_info *dti, struct node *fn,
847 xasprintf(&entry, "%s:%s:%u", 847 xasprintf(&entry, "%s:%s:%u",
848 node->fullpath, prop->name, m->offset); 848 node->fullpath, prop->name, m->offset);
849 append_to_property(fn, m->ref, entry, strlen(entry) + 1); 849 append_to_property(fn, m->ref, entry, strlen(entry) + 1);
850
851 free(entry);
850} 852}
851 853
852static void generate_fixups_tree_internal(struct dt_info *dti, 854static void generate_fixups_tree_internal(struct dt_info *dti,
@@ -900,7 +902,7 @@ static void add_local_fixup_entry(struct dt_info *dti,
900 struct node *refnode) 902 struct node *refnode)
901{ 903{
902 struct node *wn, *nwn; /* local fixup node, walk node, new */ 904 struct node *wn, *nwn; /* local fixup node, walk node, new */
903 uint32_t value_32; 905 fdt32_t value_32;
904 char **compp; 906 char **compp;
905 int i, depth; 907 int i, depth;
906 908