diff options
| author | George McCollister <george.mccollister@gmail.com> | 2017-03-30 09:44:25 -0500 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-04-13 11:43:49 -0600 |
| commit | f156b5b59750f4140ffa2dd6a5eab686ba0212c3 (patch) | |
| tree | f50439a666cc62aad59bf49b611a1f43db75103d | |
| parent | 6db06f94e19d539bb7001a666e7c52672e0682ea (diff) | |
| download | u-boot-f156b5b59750f4140ffa2dd6a5eab686ba0212c3.tar.gz | |
dtoc: Decode val if it's a byte string
With Python 3.5.2 encode will throw an exception if val is a byte array.
Decode it to a string first. This assumes it's utf-8, if it's not valid
utf-8 it will throw an exception.
Signed-off-by: George McCollister <george.mccollister@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/dtoc/fdt_util.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py index e6d523b9de..b9dfae8d0e 100644 --- a/tools/dtoc/fdt_util.py +++ b/tools/dtoc/fdt_util.py @@ -24,6 +24,8 @@ def fdt32_to_cpu(val): A native-endian integer value """ if sys.version_info > (3, 0): + if isinstance(val, bytes): + val = val.decode('utf-8') val = val.encode('raw_unicode_escape') return struct.unpack('>I', val)[0] |