diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-04 10:51:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-04 10:51:58 -0400 |
| commit | ddec4cae624e48c3678ea856fa7d6292a7104238 (patch) | |
| tree | bb04231fb05cf9d3fc018bf874bbb6e8373968d8 /tools/dtoc/fdt.py | |
| parent | f2bb6d9ffd9ba0d0d89c00445a70cf81327a7af2 (diff) | |
| parent | b27eeca112c1b9eef6f06a320a4310d766ac5659 (diff) | |
Merge tag 'v2023.10-rc4' into next
Prepare v2023.10-rc4
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 0b20d52f313..5963925146a 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: |