leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binman: Allow state functions to fail to return data

Browse Source 
At present these state functions raise an exception if they cannot find
what is requested. But in some cases the information is optional (e.g. an
fdtmap in a coming patch) so it is better to return gracefully.

Update these two functions to return None when the data cannot be found.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-07-20 12:23:42 -06:00
parent d5079330f5
commit 6a3b5b5411
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/binman/state.py
View File

@ -49,7 +49,10 @@ def GetFdtForEtype(etype):
Returns:
Fdt object associated with the entry type
"""
return output_fdt_files[etype][0]
value = output_fdt_files.get(etype);
if not value:
return None
return value[0]
def GetFdtPath(etype):
"""Get the full pathname of a particular Fdt object
@ -80,7 +83,9 @@ def GetFdtContents(etype='u-boot-dtb'):
pathname to Fdt
Fdt data (as bytes)
"""
if etype in output_fdt_files and not use_fake_dtb:
if etype not in output_fdt_files:
return None, None
if not use_fake_dtb:
pathname = GetFdtPath(etype)
data = GetFdtForEtype(etype).GetContents()
else: