michaelh/zephyr
1
0
Fork 0
Code Releases Activity

script: extract_dts_includes: fix recursive inclusion

Browse source 
extract_dts_includes script was not handling correctly
recusrsive inclusions. Fix it.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2017-11-29 12:06:31 +01:00 • committed by Kumar Gala
commit 318436589c
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/dts/extract_dts_includes.py
View file

@ -579,18 +579,11 @@ def yaml_traverse_inherited(node):
""" """
if 'inherits' in node.keys(): if 'inherits' in node.keys():
try: if 'inherits' in node['inherits'].keys():
yaml_traverse_inherited(node['inherits']['inherits']) node['inherits'] = yaml_traverse_inherited(node['inherits'])
except KeyError: dict_merge(node['inherits'], node)
dict_merge(node['inherits'], node) node = node['inherits']
node = node['inherits'] node.pop('inherits')
node.pop('inherits')
except TypeError:
#'node['inherits']['inherits'] type is 'list' instead of
#expected type 'dtc'
#Likely due to use of "-" before attribute in yaml file
raise Exception("Element '" + str(node['title']) +
"' uses yaml 'series' instead of 'mapping'")
return node return node