From: Paul Burton <paul.burton@imgtec.com>
Date: Tue, 27 Sep 2016 15:03:57 +0000 (+0100)
Subject: dtoc: Decode strings for struct.unpack on python 3.x
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c4c5f9eefbda7231d0e9703905524faebe71e795;p=u-boot.git

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>
---

diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py
index 3a10838109..e6d523b9de 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):