diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-08 20:36:18 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-12-13 07:58:17 -0700 |
| commit | fc0056e8d5ab62adc17455c99864d9a974633a46 (patch) | |
| tree | bdb79ac7a36cc03636735f863c1ee53c9e36f488 /tools/binman | |
| parent | 5ea9dccf02eb26d146dbc1fdb3106135612820ae (diff) | |
| download | u-boot-fc0056e8d5ab62adc17455c99864d9a974633a46.zip u-boot-fc0056e8d5ab62adc17455c99864d9a974633a46.tar.gz u-boot-fc0056e8d5ab62adc17455c99864d9a974633a46.tar.bz2 | |
patman: Drop unicode helper functions
We don't need these now that everything uses Python 3. Remove them and
the extra code in GetBytes() and ToBytes() too.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/etype/fmap.py | 2 | ||||
| -rw-r--r-- | tools/binman/fmap_util.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/binman/etype/fmap.py b/tools/binman/etype/fmap.py index 3e9b815..fe81c6f 100644 --- a/tools/binman/etype/fmap.py +++ b/tools/binman/etype/fmap.py @@ -52,7 +52,7 @@ class Entry_fmap(Entry): if pos is not None: pos -= entry.section.GetRootSkipAtStart() areas.append(fmap_util.FmapArea(pos or 0, entry.size or 0, - tools.FromUnicode(entry.name), 0)) + entry.name, 0)) entries = self.GetImage().GetEntries() areas = [] diff --git a/tools/binman/fmap_util.py b/tools/binman/fmap_util.py index 25fe60a..b03fc28 100644 --- a/tools/binman/fmap_util.py +++ b/tools/binman/fmap_util.py @@ -111,8 +111,7 @@ def EncodeFmap(image_size, name, areas): ConvertName(names, params) return struct.pack(fmt, *params) - values = FmapHeader(FMAP_SIGNATURE, 1, 0, 0, image_size, - tools.FromUnicode(name), len(areas)) + values = FmapHeader(FMAP_SIGNATURE, 1, 0, 0, image_size, name, len(areas)) blob = _FormatBlob(FMAP_HEADER_FORMAT, FMAP_HEADER_NAMES, values) for area in areas: blob += _FormatBlob(FMAP_AREA_FORMAT, FMAP_AREA_NAMES, area) |