aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-01-06 21:35:10 -0700
committerSimon Glass <sjg@chromium.org>2021-01-30 14:25:41 -0700
commit9fc6ebd8feb4654483b544d12587857cf8938796 (patch)
tree5c4a4437f449dc03916f783efe6c973b755e9a80 /tools
parent5c53da2b30819514bc309888ad71890494e32295 (diff)
downloadu-boot-9fc6ebd8feb4654483b544d12587857cf8938796.zip
u-boot-9fc6ebd8feb4654483b544d12587857cf8938796.tar.gz
u-boot-9fc6ebd8feb4654483b544d12587857cf8938796.tar.bz2
dtoc: binman: Drop Python 2 code
Drop a few more Python 2 relics that are no-longer needed. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/binman/fmap_util.py4
-rw-r--r--tools/dtoc/fdt.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/binman/fmap_util.py b/tools/binman/fmap_util.py
index b03fc28..8277619 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):
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index 4a78c73..965106a 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -460,8 +460,7 @@ class Node:
prop_name: Name of property to add
val: String value of property
"""
- if sys.version_info[0] >= 3: # pragma: no cover
- val = bytes(val, 'utf-8')
+ val = bytes(val, 'utf-8')
self.AddData(prop_name, val + b'\0')
def AddSubnode(self, name):