diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-05 07:59:28 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-05 07:59:28 -0500 |
commit | b62553736e0131b88befad128a2dd40c75e3293c (patch) | |
tree | 8164b210b7788aae0e86ce143e35240013b9d0c6 /tools/dtoc/fdt.py | |
parent | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (diff) | |
parent | 388560134b99dc4cc752627d3a7e9f8c8c2a89a7 (diff) |
Merge tag 'fdt-pull-5nov19' of git://git.denx.de/u-boot-fdt
Update to latest libfdt and pylibfdt, with added size control
Update binman, dtoc, patman, buildman to Python 3
Update move_config, rkmux, microcode_tool to Python 3
Diffstat (limited to 'tools/dtoc/fdt.py')
-rw-r--r-- | tools/dtoc/fdt.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 6770be79fbe..1b7b730359a 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -56,9 +56,6 @@ def BytesToValue(data): is_string = False break for ch in string: - # Handle Python 2 treating bytes as str - if type(ch) == str: - ch = ord(ch) if ch < 32 or ch > 127: is_string = False break @@ -66,15 +63,9 @@ def BytesToValue(data): is_string = False if is_string: if count == 1: - if sys.version_info[0] >= 3: # pragma: no cover - return TYPE_STRING, strings[0].decode() - else: - return TYPE_STRING, strings[0] + return TYPE_STRING, strings[0].decode() else: - if sys.version_info[0] >= 3: # pragma: no cover - return TYPE_STRING, [s.decode() for s in strings[:-1]] - else: - return TYPE_STRING, strings[:-1] + return TYPE_STRING, [s.decode() for s in strings[:-1]] if size % 4: if size == 1: return TYPE_BYTE, tools.ToChar(data[0]) @@ -415,8 +406,8 @@ class Node: prop_name: Name of property to set val: String value to set (will be \0-terminated in DT) """ - if sys.version_info[0] >= 3: # pragma: no cover - val = bytes(val, 'utf-8') + if type(val) == str: + val = val.encode('utf-8') self._CheckProp(prop_name).props[prop_name].SetData(val + b'\0') def AddString(self, prop_name, val): |