summaryrefslogtreecommitdiff
path: root/util/mtkheader
diff options
context:
space:
mode:
authorYilin Yang <kerker@google.com>2020-09-16 14:20:52 +0800
committerHung-Te Lin <hungte@chromium.org>2020-09-18 08:00:22 +0000
commitf944e619dd2739d268fc7eaea85d8acdf91bbfb8 (patch)
treeb858eabdad86c0373eb701dad8a6de279e5f0d0f /util/mtkheader
parent541f2f74a37db36a8e35800950fd02adb0443d88 (diff)
downloadcoreboot-f944e619dd2739d268fc7eaea85d8acdf91bbfb8.tar.xz
util/mtkheader: Port gen-bl-img.py to python3
BUG=chromium:1023662 TEST=1. Use python2 script 2. Run `emerge-asurada coreboot` twice, so we get bootblock.bin.1 and bootblock.bin.2 3. Run `xxd` on these two bootblock so we get bootblock.bin.1.hex and bootblock.bin.2.hex 4. `diff bootblock.bin.1.hex bootblock.bin.2.hex` and record the difference. (at least, the time info changes) 5. Migrate to python3 6. Similar steps, we get bootblock.bin.py3.hex 7. `diff bootblock.bin.1.hex bootblock.bin.py3.hex`, the difference is similar. Signed-off-by: Yilin Yang <kerker@google.com> Change-Id: I788e7c9b09257142728a0f76df8c2ccc72bf6b3b Reviewed-on: https://review.coreboot.org/c/coreboot/+/45440 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Diffstat (limited to 'util/mtkheader')
-rw-r--r--util/mtkheader/description.md2
-rwxr-xr-xutil/mtkheader/gen-bl-img.py34
2 files changed, 18 insertions, 18 deletions
diff --git a/util/mtkheader/description.md b/util/mtkheader/description.md
index d426636da8..01c0776c3c 100644
--- a/util/mtkheader/description.md
+++ b/util/mtkheader/description.md
@@ -1 +1 @@
-Generate MediaTek bootload header. `Python2`
+Generate MediaTek bootload header. `Python3`
diff --git a/util/mtkheader/gen-bl-img.py b/util/mtkheader/gen-bl-img.py
index 282dfbfa9f..1627a79f17 100755
--- a/util/mtkheader/gen-bl-img.py
+++ b/util/mtkheader/gen-bl-img.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
#
# SPDX-License-Identifier: GPL-2.0-only
@@ -14,10 +14,10 @@ def write(path, data):
with open(path, 'wb') as f:
f.write(data)
-def padding(data, size, pattern='\0'):
+def padding(data, size, pattern=b'\0'):
return data + pattern * (size - len(data))
-def align(data, size, pattern='\0'):
+def align(data, size, pattern=b'\0'):
return padding(data, (len(data) + (size - 1)) & ~(size - 1), pattern)
def gen_gfh_info(chip, data):
@@ -47,19 +47,19 @@ def gen_gfh_info(chip, data):
return gfh
def gen_emmc_header(data):
- header = (padding(struct.pack('<12sII', 'EMMC_BOOT', 1, 512), 512, '\xff') +
- padding(struct.pack('<8sIIIIIIII', 'BRLYT', 1, 2048, 2048 + len(data),
- 0x42424242, 0x00010005, 2048, 2048 + len(data), 1) + '\0' * 140, 512,
- '\xff') +
- '\0' * 1024)
+ header = (padding(struct.pack('<12sII', b'EMMC_BOOT', 1, 512), 512, b'\xff') +
+ padding(struct.pack('<8sIIIIIIII', b'BRLYT', 1, 2048, 2048 + len(data),
+ 0x42424242, 0x00010005, 2048, 2048 + len(data), 1) + b'\0' * 140, 512,
+ b'\xff') +
+ b'\0' * 1024)
return header
def gen_sf_header(data):
- header = (padding(struct.pack('<12sII', 'SF_BOOT', 1, 512), 512, '\xff') +
- padding(struct.pack('<8sIIIIIIII', 'BRLYT', 1, 2048, 2048 + len(data),
- 0x42424242, 0x00010007, 2048, 2048 + len(data), 1) + '\0' * 140, 512,
- '\xff') +
- '\0' * 1024)
+ header = (padding(struct.pack('<12sII', b'SF_BOOT', 1, 512), 512, b'\xff') +
+ padding(struct.pack('<8sIIIIIIII', b'BRLYT', 1, 2048, 2048 + len(data),
+ 0x42424242, 0x00010007, 2048, 2048 + len(data), 1) + b'\0' * 140, 512,
+ b'\xff') +
+ b'\0' * 1024)
return header
gen_dev_header = {
@@ -71,15 +71,15 @@ def gen_preloader(chip_ver, flash_type, data):
gfh_info = gen_gfh_info(chip_ver, data)
gfh_hash = hashlib.sha256(gfh_info + data).digest()
- data = align(gfh_info + data + gfh_hash, 512, '\xff')
+ data = align(gfh_info + data + gfh_hash, 512, b'\xff')
header = gen_dev_header[flash_type](data)
return header + data
def main(argv):
if len(argv) != 5:
- print 'Usage: %s <chip> <flash_type> <input_file> <output_file>' % argv[0]
- print '\t flash_type: emmc|sf'
- print '\t chip : mt8173|mt8183'
+ print('Usage: %s <chip> <flash_type> <input_file> <output_file>' % argv[0])
+ print('\t flash_type: emmc|sf')
+ print('\t chip : mt8173|mt8183')
exit(1)
write(argv[4], gen_preloader(argv[1], argv[2], read(argv[3])))