dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

dtoc: Adjust GetProps() in fdt_normal to use the node path

Browse Source 
There is no need to pass a node path separately. Instead we should use the
path for the node provided. Correct this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2016-09-25 15:52:18 -06:00
committed by sjg
parent 0734b70c9c
commit 8828254cae
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/dtoc/fdt_normal.py
View File

@@ -81,7 +81,7 @@ class Node(NodeBase):
This fills in the props and subnodes properties, recursively This fills in the props and subnodes properties, recursively
searching into subnodes so that the entire tree is built. searching into subnodes so that the entire tree is built.
""" """
self.props = self._fdt.GetProps(self, self.path) self.props = self._fdt.GetProps(self)
offset = libfdt.fdt_first_subnode(self._fdt.GetFdt(), self.Offset()) offset = libfdt.fdt_first_subnode(self._fdt.GetFdt(), self.Offset())
while offset >= 0: while offset >= 0:
@@ -159,7 +159,7 @@ class FdtNormal(Fdt):
fdt_len = libfdt.fdt_totalsize(self._fdt) fdt_len = libfdt.fdt_totalsize(self._fdt)
del self._fdt[fdt_len:] del self._fdt[fdt_len:]
def GetProps(self, node, path): def GetProps(self, node):
"""Get all properties from a node. """Get all properties from a node.
Args: Args:
@@ -172,11 +172,8 @@ class FdtNormal(Fdt):
Raises: Raises:
ValueError: if the node does not exist. ValueError: if the node does not exist.
""" """
offset = libfdt.fdt_path_offset(self._fdt, path)
if offset < 0:
libfdt.Raise(offset)
props_dict = {} props_dict = {}
poffset = libfdt.fdt_first_property_offset(self._fdt, offset) poffset = libfdt.fdt_first_property_offset(self._fdt, node._offset)
while poffset >= 0: while poffset >= 0:
dprop, plen = libfdt.fdt_get_property_by_offset(self._fdt, poffset) dprop, plen = libfdt.fdt_get_property_by_offset(self._fdt, poffset)
prop = Prop(node, poffset, libfdt.String(self._fdt, dprop.nameoff), prop = Prop(node, poffset, libfdt.String(self._fdt, dprop.nameoff),