michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts/dts: Simplify and remove dead code in Bindings._extract_file()

Browse source 
As written, this function could take e.g. '!include bar', find 'foo-bar'
(due to the endswith()), and include it. This is undocumented and
doesn't seem to be used, so I'm guessing that it isn't intentional.

Removing that bug/feature also makes the code much simpler.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-02-13 03:07:10 +01:00 • committed by Kumar Gala
commit 4a99dbcf9e
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
scripts/dts/extract_dts_includes.py
View file

@ -59,25 +59,24 @@ class Bindings(yaml.Loader):
raise yaml.constructor.ConstructorError
def _extract_file(self, filename):
filepaths = [filepath for filepath in binding_files if filepath.endswith(filename)]
if len(filepaths) == 0:
print("Error: unknown file name '{}' in !include statement".
format(filename))
filepaths = [
filepath for filepath in binding_files
if os.path.basename(filepath) == os.path.basename(filename)]
if not filepaths:
print("Error: unknown file name '{}' in !include statement"
.format(filename))
raise yaml.constructor.ConstructorError
elif len(filepaths) > 1:
# multiple candidates for filename
files = []
for filepath in filepaths:
if os.path.basename(filename) == os.path.basename(filepath):
files.append(filepath)
if len(files) > 1:
print("Error: multiple candidates for file name '{}' in !include statement".
format(filename), filepaths)
raise yaml.constructor.ConstructorError
filepaths = files
if len(filepaths) > 1:
print("Error: multiple candidates for file name '{}' in !include "
"statement: {}".format(filename, filepaths))
raise yaml.constructor.ConstructorError
with open(filepaths[0], 'r', encoding='utf-8') as f:
return yaml.load(f, Bindings)
def extract_bus_name(node_address, def_label):
label = def_label + '_BUS_NAME'
prop_alias = {}