From 793c8597f41667576f47a34e1c145fd6bcf24c81 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Tue, 25 Aug 2020 18:07:51 +0200 Subject: mkdtboimg: Allow specifying full path for dtb * Some vendors /MTK/ autogenerate the CFG at runtime and instead of using a relative path to dtbdir they use an absolute path -> Fix these cases by skipping recursive search Change-Id: I82bcba8d9f769602b59a847fa27b1ddc947a6544 --- utils/src/mkdtboimg.py | 9 +++++---- 1 file 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 -- cgit v1.2.3