From e9a3bfe38e393e1d8bd74986cdc9b99b8f9d1efc Mon Sep 17 00:00:00 2001
From: Rob Herring <robh@kernel.org>
Date: Tue, 28 Jan 2020 10:16:45 -0600
Subject: [PATCH] scripts/dtc: Revert "yamltree: Ensure consistent bracketing
of properties with phandles"
This reverts upstream commit 18d7b2f4ee45fec422b7d82bab0b3c762ee907e4. A
revert in upstream dtc is pending.
This commit didn't work for properties such as 'interrupt-map' that have
phandle in the middle of an entry. It would also not work for a 0 or -1
phandle value that acts as a NULL.
Signed-off-by: Rob Herring <robh@kernel.org>
---
scripts/dtc/yamltree.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/scripts/dtc/yamltree.c b/scripts/dtc/yamltree.c
index 43ca869dd6a86..5b6ea8ea862f0 100644
--- a/scripts/dtc/yamltree.c
+++ b/scripts/dtc/yamltree.c
@@ -138,27 +138,6 @@ static void yaml_propval(yaml_emitter_t *emitter, struct property *prop)
(yaml_char_t *)YAML_SEQ_TAG, 1, YAML_FLOW_SEQUENCE_STYLE);
yaml_emitter_emit_or_die(emitter, &event);
- /* Ensure we have a type marker before any phandle */
- for_each_marker(m) {
- int last_offset = 0;
- struct marker *type_m;
-
- if (m->type >= TYPE_UINT8)
- last_offset = m->offset;
-
- if (!(m->next && m->next->type == REF_PHANDLE &&
- last_offset < m->next->offset))
- continue;
-
- type_m = xmalloc(sizeof(*type_m));
- type_m->offset = m->next->offset;
- type_m->type = TYPE_UINT32;
- type_m->ref = NULL;
- type_m->next = m->next;
- m->next = type_m;
- }
-
- m = prop->val.markers;
for_each_marker(m) {
int chunk_len;
char *data = &prop->val.val[m->offset];
--
GitLab