diff options
author | Tom Rini <trini@konsulko.com> | 2023-04-28 19:00:01 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-04-28 19:00:01 -0400 |
commit | 076f13308c6f06e2c4feb8b408e997bc732586e1 (patch) | |
tree | 412d95d550e2e03214f48c89db608c57886e0995 /tools/binman/control.py | |
parent | c9c2c95d4cd27fe0cd41fe13a863899d268f973c (diff) | |
parent | f43fc16812487289e98389f0f643d20c444f9c9c (diff) |
Merge tag 'dm-pull-28apr23' of https://source.denx.de/u-boot/custodians/u-boot-dm
sandbox and fdt bug fixes / tweaks
various other minor fixes
Diffstat (limited to 'tools/binman/control.py')
-rw-r--r-- | tools/binman/control.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index 0febcb79a60..68597c4e779 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -7,7 +7,11 @@ from collections import OrderedDict import glob -import importlib.resources +try: + import importlib.resources +except ImportError: + # for Python 3.6 + import importlib_resources import os import pkg_resources import re |