diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-09-27 16:03:57 +0100 |
|---|---|---|
| committer | sjg <sjg@chromium.org> | 2016-10-09 09:30:32 -0600 |
| commit | c4c5f9eefbda7231d0e9703905524faebe71e795 (patch) | |
| tree | bf7d1fe32621b70250c37e699110ebefd3302290 | |
| parent | 4ae6549f8e1cd31076c6dbabef568689fc313a13 (diff) | |
| download | u-boot-c4c5f9eefbda7231d0e9703905524faebe71e795.zip u-boot-c4c5f9eefbda7231d0e9703905524faebe71e795.tar.gz u-boot-c4c5f9eefbda7231d0e9703905524faebe71e795.tar.bz2 | |
dtoc: Decode strings for struct.unpack on python 3.x
On python 3.x struct.unpack will complain if we provide it with a
string since it expects to operate on a bytes object. In order to
satisfy this requirement, encode the string to a bytes object when
running on python 3.x.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/dtoc/fdt_util.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py index 3a10838..e6d523b 100644 --- a/tools/dtoc/fdt_util.py +++ b/tools/dtoc/fdt_util.py @@ -8,6 +8,7 @@ import os import struct +import sys import tempfile import command @@ -22,6 +23,8 @@ def fdt32_to_cpu(val): Return: A native-endian integer value """ + if sys.version_info > (3, 0): + val = val.encode('raw_unicode_escape') return struct.unpack('>I', val)[0] def EnsureCompiled(fname): |