diff options
author | Steve Muckle <smuckle@google.com> | 2020-03-06 11:05:22 -0800 |
---|---|---|
committer | Steve Muckle <smuckle@google.com> | 2020-03-19 14:56:04 -0700 |
commit | 5bb77e1e36b995b8be9e24588ab20d4691e88c4d (patch) | |
tree | f548d3d5269d65f90c2fd034192505217525ecac | |
parent | d691fd76a37bd78625eafaaecd8042ca51f1f61b (diff) | |
download | mkbootimg-5bb77e1e36b995b8be9e24588ab20d4691e88c4d.tar.gz |
fix size of vendor boot header
The vendor boot header is 2112 bytes, not 2108 bytes.
Bug: 150749127
Merged-In: Ib42222f29a7a75f552cc886437b8967f195227b5
Change-Id: Ib42222f29a7a75f552cc886437b8967f195227b5
-rw-r--r-- | include/bootimg/bootimg.h | 2 | ||||
-rw-r--r-- | mkbootimg.py | 2 | ||||
-rwxr-xr-x | unpack_bootimg.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/bootimg/bootimg.h b/include/bootimg/bootimg.h index dff07f5..8c9f6ee 100644 --- a/include/bootimg/bootimg.h +++ b/include/bootimg/bootimg.h @@ -190,7 +190,7 @@ struct boot_img_hdr_v2 : public boot_img_hdr_v1 { * | dtb | q pages * +---------------------+ - * o = (2108 + page_size - 1) / page_size + * o = (2112 + page_size - 1) / page_size * p = (vendor_ramdisk_size + page_size - 1) / page_size * q = (dtb_size + page_size - 1) / page_size * diff --git a/mkbootimg.py b/mkbootimg.py index b06d42d..9682033 100644 --- a/mkbootimg.py +++ b/mkbootimg.py @@ -82,7 +82,7 @@ def write_header_v3(args): pad_file(args.output, BOOT_IMAGE_HEADER_V3_PAGESIZE) def write_vendor_boot_header(args): - VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2108 + VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2112 BOOT_MAGIC = 'VNDRBOOT'.encode() args.vendor_boot.write(pack('8s', BOOT_MAGIC)) diff --git a/unpack_bootimg.py b/unpack_bootimg.py index 628c19b..83c2bbe 100755 --- a/unpack_bootimg.py +++ b/unpack_bootimg.py @@ -24,7 +24,7 @@ from struct import unpack import os BOOT_IMAGE_HEADER_V3_PAGESIZE = 4096 -VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2108 +VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2112 def create_out_dir(dir_path): """creates a directory 'dir_path' if it does not exist""" |