mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
3decfa3a87
If an entry argument is needed by an entry but the entry argument is not present, then a strange error can occur when trying to read the file. Fix this by allowing arguments to be required. Select this option for the cros-ec-rw entry. If a filename is provided in the node, allow that to be used. Also tidy up a few related tests to make the error string easier to find, and fully ignore unused return values. Signed-off-by: Simon Glass <sjg@chromium.org>
37 lines
1.4 KiB
Python
37 lines
1.4 KiB
Python
# SPDX-License-Identifier: GPL-2.0+
|
|
# Copyright (c) 2018 Google, Inc
|
|
# Written by Simon Glass <sjg@chromium.org>
|
|
#
|
|
# Entry-type module for a blob where the filename comes from a property in the
|
|
# node or an entry argument. The property is called '<blob_fname>-path' where
|
|
# <blob_fname> is provided by the subclass using this entry type.
|
|
|
|
from collections import OrderedDict
|
|
|
|
from binman.etype.blob import Entry_blob
|
|
from binman.entry import EntryArg
|
|
|
|
|
|
class Entry_blob_named_by_arg(Entry_blob):
|
|
"""A blob entry which gets its filename property from its subclass
|
|
|
|
Properties / Entry arguments:
|
|
- <xxx>-path: Filename containing the contents of this entry (optional,
|
|
defaults to None)
|
|
|
|
where <xxx> is the blob_fname argument to the constructor.
|
|
|
|
This entry cannot be used directly. Instead, it is used as a parent class
|
|
for another entry, which defined blob_fname. This parameter is used to
|
|
set the entry-arg or property containing the filename. The entry-arg or
|
|
property is in turn used to set the actual filename.
|
|
|
|
See cros_ec_rw for an example of this.
|
|
"""
|
|
def __init__(self, section, etype, node, blob_fname, required=False):
|
|
super().__init__(section, etype, node)
|
|
filename, = self.GetEntryArgsOrProps(
|
|
[EntryArg('%s-path' % blob_fname, str)], required=required)
|
|
if filename:
|
|
self._filename = filename
|