From: George McCollister <george.mccollister@gmail.com>
Date: Thu, 30 Mar 2017 14:44:25 +0000 (-0500)
Subject: dtoc: Decode val if it's a byte string
X-Git-Tag: v2017.05-rc2~8^2~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f156b5b59750f4140ffa2dd6a5eab686ba0212c3;p=oweals%2Fu-boot.git

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

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]