diff options
| author | Simon Glass <sjg@chromium.org> | 2023-08-24 04:18:02 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-28 22:59:22 +0300 |
| commit | bbbf04cc7da1b60ed6b342700ec366f27d49546e (patch) | |
| tree | bc77dee6bf7fb3bdd75c274c8e768ba8f5cf33ed /tools/dtoc/fdt.py | |
| parent | 98244a85507d7ba77ffab56d458eef25629271ec (diff) | |
| download | u-boot-bbbf04cc7da1b60ed6b342700ec366f27d49546e.tar.xz | |
Revert "binman: Add a temporary hack for duplicate phandles"
The affected boards have been fixed, so drop this hack.
This reverts commit 288ae53cb73605500b7fc01e5919753c878466be.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Tim Harvey <tharvey@gateworks.com>
Diffstat (limited to 'tools/dtoc/fdt.py')
| -rw-r--r-- | tools/dtoc/fdt.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 0b20d52f31..5963925146 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -15,9 +15,6 @@ from libfdt import QUIET_NOTFOUND from u_boot_pylib import tools from u_boot_pylib import tout -# Temporary hack -IGNORE_DUP_PHANDLES = False - # This deals with a device tree, presenting it as an assortment of Node and # Prop objects, representing nodes and properties, respectively. This file # contains the base classes and defines the high-level API. You can use @@ -342,11 +339,10 @@ class Node: if phandle: dup = self._fdt.phandle_to_node.get(phandle) if dup: - if not IGNORE_DUP_PHANDLES: - raise ValueError( - f'Duplicate phandle {phandle} in nodes {dup.path} and {self.path}') - else: - self._fdt.phandle_to_node[phandle] = self + raise ValueError( + f'Duplicate phandle {phandle} in nodes {dup.path} and {self.path}') + + self._fdt.phandle_to_node[phandle] = self offset = fdt_obj.first_subnode(self.Offset(), QUIET_NOTFOUND) while offset >= 0: |