michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dtlib: fix 'phandle' property's filename and line number

Browse source 
The phandle property is auto-generated when parsing the DTS, so there is
no 'source information'. This commit sets the filename and line number
of the phandle property to be the same as the first reference to the
target node.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
This commit is contained in:
Luca Burelli 2025-05-01 16:51:41 +02:00 • committed by Benjamin Cabé
commit 4b8be385c0
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/dts/python-devicetree/src/devicetree/dtlib.py
View file

@ -1415,7 +1415,7 @@ class DT:
prop._add_marker(_MarkerType.LABEL, tok.val) prop._add_marker(_MarkerType.LABEL, tok.val)
self._next_token() self._next_token()
def _node_phandle(self, node): def _node_phandle(self, node, src_prop):
# Returns the phandle for Node 'node', creating a new phandle if the # Returns the phandle for Node 'node', creating a new phandle if the
# node has no phandle, and fixing up the value for existing # node has no phandle, and fixing up the value for existing
# self-referential phandles (which get set to b'\0\0\0\0' initially). # self-referential phandles (which get set to b'\0\0\0\0' initially).
@ -1435,6 +1435,8 @@ class DT:
phandle_i += 1 phandle_i += 1
self.phandle2node[phandle_i] = node self.phandle2node[phandle_i] = node
phandle_prop.filename = src_prop.filename
phandle_prop.lineno = src_prop.lineno
phandle_prop.value = phandle_i.to_bytes(4, "big") phandle_prop.value = phandle_i.to_bytes(4, "big")
node.props["phandle"] = phandle_prop node.props["phandle"] = phandle_prop
@ -1878,7 +1880,7 @@ class DT:
if marker_type is _MarkerType.PATH: if marker_type is _MarkerType.PATH:
res += ref_node.path.encode("utf-8") + b'\0' res += ref_node.path.encode("utf-8") + b'\0'
else: # marker_type is PHANDLE else: # marker_type is PHANDLE
res += self._node_phandle(ref_node) res += self._node_phandle(ref_node, prop)
# Skip over the dummy phandle placeholder # Skip over the dummy phandle placeholder
pos += 4 pos += 4