diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-29 10:06:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-29 10:06:08 -0400 |
| commit | 0fe0395922d859730eb7ddfcff6ed8d3ac4b2937 (patch) | |
| tree | 0249ca6a72069c709655a636fff70a931e5aa355 /tools | |
| parent | 6a1d3f64c201ed3f6df819cfcf08154b6ec1c02e (diff) | |
| parent | c91feda87ce33c81acc51cc4bf69d613c4fe89de (diff) | |
| download | u-boot-kii-pro-master.tar.gz | |
- A few platform-specific config/dts updates to fix issues, drop a
temporary change in binman, update the MAINTAINERS file to remove
Wolfgang Denk, fix a typo, fix a corner case with bootstd, update
Azure to not timeout so easily, and fix a case where we would omit
some files in SPL.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/cmdline.py | 2 | ||||
| -rw-r--r-- | tools/binman/control.py | 5 | ||||
| -rw-r--r-- | tools/dtoc/fdt.py | 12 |
3 files changed, 4 insertions, 15 deletions
diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index 39c61c2c03..9632ec115e 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -126,8 +126,6 @@ controlled by a description in the board device tree.''' help='Comma-separated list of bintools to consider missing (for testing)') build_parser.add_argument('-i', '--image', type=str, action='append', help='Image filename to build (if not specified, build all)') - build_parser.add_argument('--ignore-dup-phandles', action='store_true', - help='Temporary option to ignore duplicate phandles') build_parser.add_argument('-I', '--indir', action='append', help='Add a path to the list of directories to use for input files') build_parser.add_argument('-m', '--map', action='store_true', diff --git a/tools/binman/control.py b/tools/binman/control.py index 4594895581..c6d3205b8c 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -22,7 +22,6 @@ from binman import bintool from binman import cbfs_util from binman import elf from binman import entry -from dtoc import fdt from dtoc import fdt_util from u_boot_pylib import command from u_boot_pylib import tools @@ -817,10 +816,6 @@ def Binman(args): cbfs_util.VERBOSE = args.verbosity > 2 state.use_fake_dtb = args.fake_dtb - # Temporary hack - if args.ignore_dup_phandles: # pragma: no cover - fdt.IGNORE_DUP_PHANDLES = True - # Normally we replace the 'u-boot' etype with 'u-boot-expanded', etc. # When running tests this can be disabled using this flag. When not # updating the FDT in image, it is not needed by binman, but we use it 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: |