commit 84c0da042fd5da583a2b95d045e22878d921b78f
author Rouven Czerwinski <r.czerwinski@pengutronix.de> Tue Jul 02 11:57:32 2019 +0200
committer Jérôme Forissier <jerome.forissier@linaro.org> Tue Jul 02 14:58:41 2019 +0200
tree 6934be9d69716888288f57da18f1b203de94c197
parent 2852c5c9628081860cfd94ea32c927f0252ed966

scripts: port gen_ldelf_hex to python3

Simple port for gen_ldelf_hex to python3.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

scripts/gen_ldelf_hex.py

diff --git a/scripts/gen_ldelf_hex.py b/scripts/gen_ldelf_hex.py
index 5077cc4..c3969e3 100755
--- a/scripts/gen_ldelf_hex.py
+++ b/scripts/gen_ldelf_hex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2019, Linaro Limited
@@ -45,25 +45,26 @@
             load_size += segment['p_filesz']
             n = n + 1
 
-    outf.write('const uint8_t ldelf_data[%d]' % round_up(load_size, 4096))
-    outf.write(' __aligned(4096) = {\n')
+    outf.write(b'const uint8_t ldelf_data[%d]' % round_up(load_size, 4096))
+    outf.write(b' __aligned(4096) = {\n')
     i = 0
     for segment in elffile.iter_segments():
         if segment['p_type'] == 'PT_LOAD':
             data = segment.data()
             for n in range(segment['p_filesz']):
                 if i % 8 == 0:
-                    outf.write('\t')
-                outf.write('0x' + '{:02x}'.format(ord(data[n])) + ',')
+                    outf.write(b'\t')
+                outf.write(b'0x' + '{:02x}'.format(data[n]).encode('utf-8')
+                           + b',')
                 i = i + 1
                 if i % 8 == 0 or i == load_size:
-                    outf.write('\n')
+                    outf.write(b'\n')
                 else:
-                    outf.write(' ')
-    outf.write('};\n')
+                    outf.write(b' ')
+    outf.write(b'};\n')
 
-    outf.write('const unsigned int ldelf_code_size = %d;\n' % code_size)
-    outf.write('const unsigned int ldelf_data_size = %d;\n' % data_size)
+    outf.write(b'const unsigned int ldelf_code_size = %d;\n' % code_size)
+    outf.write(b'const unsigned int ldelf_data_size = %d;\n' % data_size)
 
 
 def get_args():
@@ -87,11 +88,11 @@
 
     elffile = ELFFile(inf)
 
-    outf.write('/* Automatically generated, do no edit */\n')
-    outf.write('#include <compiler.h>\n')
-    outf.write('#include <stdint.h>\n')
+    outf.write(b'/* Automatically generated, do no edit */\n')
+    outf.write(b'#include <compiler.h>\n')
+    outf.write(b'#include <stdint.h>\n')
     emit_load_segments(elffile, outf)
-    outf.write('const unsigned long ldelf_entry = %lu;\n' %
+    outf.write(b'const unsigned long ldelf_entry = %lu;\n' %
                elffile.header['e_entry'])
 
     inf.close()