[U-Boot] [PATCH 2/2] dtoc: Decode val if it's a byte string

George McCollister george.mccollister at gmail.com
Thu Mar 30 14:44:25 UTC 2017


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 at gmail.com>
---
 tools/dtoc/fdt_util.py | 2 ++
 1 file changed, 2 insertions(+)

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



More information about the U-Boot mailing list