aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/dtc/yamltree.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2020-01-28 10:16:45 -0600
committerRob Herring <robh@kernel.org>2020-01-28 10:21:47 -0600
commite9a3bfe38e393e1d8bd74986cdc9b99b8f9d1efc (patch)
tree001786e5f7a43dbd2a794e3996ce32d4ab1de000 /scripts/dtc/yamltree.c
parentof: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc (diff)
downloadlinux-dev-e9a3bfe38e393e1d8bd74986cdc9b99b8f9d1efc.tar.xz
linux-dev-e9a3bfe38e393e1d8bd74986cdc9b99b8f9d1efc.zip
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>
Diffstat (limited to '')
-rw-r--r--scripts/dtc/yamltree.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/scripts/dtc/yamltree.c b/scripts/dtc/yamltree.c
index 43ca869dd6a8..5b6ea8ea862f 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];