diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 17:31:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 17:31:06 -0400 |
| commit | b7b24a7a3cd74bb165d28a2959ed9143e3648fbf (patch) | |
| tree | 062fd13092cee10dc8746a1339ecea18f08d21d6 /tools/dtoc | |
| parent | 1622559066d890f1b7622be0ede8a5d64de66ef3 (diff) | |
| parent | 22e10be456014400788f80d45fc5f5c0b9d4a81d (diff) | |
| download | u-boot-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.zip u-boot-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.tar.gz u-boot-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Here with some DM changes as well as the long-standing AT91 DM/DT
conversion patches which I have picked up via dm.
Diffstat (limited to 'tools/dtoc')
| -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 e6d523b..b9dfae8 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] |