summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-15 18:23:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-09-15 18:23:35 +0000
commit839abd7f3f67874add1146f4ba1597f0a203b1eb (patch)
treed8d31b53d211ebbc2448c21e235bf8543a91b5de
parentf5e4d426c14b6b5d97b63f99c7fbb82b3c836532 (diff)
parent793c8597f41667576f47a34e1c145fd6bcf24c81 (diff)
downloadlibufdt-839abd7f3f67874add1146f4ba1597f0a203b1eb.tar.gz
Merge "mkdtboimg: Allow specifying full path for dtb"android11-tests-dev
-rwxr-xr-xutils/src/mkdtboimg.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/utils/src/mkdtboimg.py b/utils/src/mkdtboimg.py
index 056fb11..136543f 100755
--- a/utils/src/mkdtboimg.py
+++ b/utils/src/mkdtboimg.py
@@ -897,10 +897,11 @@ def create_dtbo_image_from_config(fout, argv):
params['version'] = version
dt_entries = []
for dt_arg in dt_args:
- filepath = None
- for root, dirnames, filenames in os.walk(args.dtbdir):
- for filename in fnmatch.filter(filenames, dt_arg['filename']):
- filepath = os.path.join(root, filename)
+ filepath = dt_arg['filename']
+ if not os.path.isabs(filepath):
+ for root, dirnames, filenames in os.walk(args.dtbdir):
+ for filename in fnmatch.filter(filenames, filepath):
+ filepath = os.path.join(root, filename)
params['dt_file'] = open(filepath, 'rb')
params['dt_offset'] = 0
params['dt_size'] = os.fstat(params['dt_file'].fileno()).st_size