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/binman/control.py | |
| parent | f2bb6d9ffd9ba0d0d89c00445a70cf81327a7af2 (diff) | |
| parent | b27eeca112c1b9eef6f06a320a4310d766ac5659 (diff) | |
Merge tag 'v2023.10-rc4' into next
Prepare v2023.10-rc4
Diffstat (limited to 'tools/binman/control.py')
| -rw-r--r-- | tools/binman/control.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index 45948955812..c6d3205b8c2 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 |