michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: extract_dts_includes: fix cell name readout from yaml

Browse source 
Default for a unavailable cell name was an empty list, whereas a
given name is a string. Leads to a runtime error if the name is given.
Make the default an empty string.

Names for cells are taken from the yaml binding. The key used is
"#cells" which clashes if there are different cell based properties
for a device. Readout names from the more specific "#xxx-cells" if
given and fall back to "#cells" if not given.

Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
This commit is contained in:
Bobby Noelte 2018-11-14 08:06:22 +01:00 • committed by Kumar Gala
commit 1bf1d6a267
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/dts/extract_dts_includes.py
View file

@ -210,12 +210,16 @@ def extract_cells(node_address, yaml, prop, prop_values, names, index,
try:
name = names.pop(0).upper()
except:
name = []
name = ''
# Get number of cells per element of current property
for k in reduced[cell_parent]['props'].keys():
if k[0] == '#' and '-cells' in k:
num_cells = reduced[cell_parent]['props'].get(k)
if k in cell_yaml.keys():
cell_yaml_names = k
else:
cell_yaml_names = '#cells'
try:
generation = yaml[get_compat(node_address)]['properties'][prop][
'generation']
@ -241,12 +245,12 @@ def extract_cells(node_address, yaml, prop, prop_values, names, index,
# Generate label for each field of the property element
for i in range(num_cells):
l_cellname = [str(cell_yaml['#cells'][i]).upper()]
l_cellname = [str(cell_yaml[cell_yaml_names][i]).upper()]
if l_cell == l_cellname:
label = l_base + l_cell + l_idx
else:
label = l_base + l_cell + l_cellname + l_idx
label_name = l_base + name + l_cellname
label_name = l_base + [name] + l_cellname
prop_def['_'.join(label)] = prop_values.pop(0)
if len(name):
prop_alias['_'.join(label_name)] = '_'.join(label)