diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-31 08:49:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-31 08:49:53 -0500 |
| commit | 242ef48ea76ae13ac6357cc50aae01eb7a46bfef (patch) | |
| tree | 18105866b6063eddcc7ddb0530c002fadc377b3b /tools/binman/fmap_util.py | |
| parent | 76404f86a24aa28efc26a296bf6ab9d697c60b9f (diff) | |
| parent | f84eda89e5970ef513fe64ba8e8d977788c44dca (diff) | |
Merge tag 'dm-pull-30jan21' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
tpm fixes for coral
binman fixes support for symbols in sub-sections
support for additional cros_ec commands
various minor fixes / tweaks
Diffstat (limited to 'tools/binman/fmap_util.py')
| -rw-r--r-- | tools/binman/fmap_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/binman/fmap_util.py b/tools/binman/fmap_util.py index b03fc28fbb4..8277619768c 100644 --- a/tools/binman/fmap_util.py +++ b/tools/binman/fmap_util.py @@ -53,8 +53,8 @@ FmapArea = collections.namedtuple('FmapArea', FMAP_AREA_NAMES) def NameToFmap(name): - if type(name) == bytes and sys.version_info[0] >= 3: - name = name.decode('utf-8') # pragma: no cover (for Python 2) + if type(name) == bytes: + name = name.decode('utf-8') return name.replace('\0', '').replace('-', '_').upper() def ConvertName(field_names, fields): |