Revert "mkbootimg: add version and patch level"
This reverts commit dcdf300a1f5b0ad3fb517e53cfe09cc8eab05311.
Bug: 27580174
Change-Id: I49780dc522b5d1c4939749fe0d38124821f67c12
diff --git a/mkbootimg/bootimg.h b/mkbootimg/bootimg.h
index 2bd8230..5ab6195 100644
--- a/mkbootimg/bootimg.h
+++ b/mkbootimg/bootimg.h
@@ -43,11 +43,7 @@
uint32_t tags_addr; /* physical addr for kernel tags */
uint32_t page_size; /* flash page size we assume */
-
- /* operating system version; "1.2.34" -> 010234 */
- uint32_t os_version;
- /* operating system patch level; "2016-01-01" -> 20160101 */
- uint32_t os_patch_level;
+ uint32_t unused[2]; /* future expansion: should be 0 */
uint8_t name[BOOT_NAME_SIZE]; /* asciiz product name */
diff --git a/mkbootimg/mkbootimg b/mkbootimg/mkbootimg
index be342c9..f95d703 100755
--- a/mkbootimg/mkbootimg
+++ b/mkbootimg/mkbootimg
@@ -20,7 +20,6 @@
from struct import pack
from hashlib import sha1
import sys
-import re
def filesize(f):
if f is None:
@@ -48,7 +47,7 @@
def write_header(args):
BOOT_MAGIC = 'ANDROID!'.encode()
args.output.write(pack('8s', BOOT_MAGIC))
- args.output.write(pack('10I',
+ args.output.write(pack('8I',
filesize(args.kernel), # size in bytes
args.base + args.kernel_offset, # physical load addr
filesize(args.ramdisk), # size in bytes
@@ -56,9 +55,8 @@
filesize(args.second), # size in bytes
args.base + args.second_offset, # physical load addr
args.base + args.tags_offset, # physical addr for kernel tags
- args.pagesize, # flash page size we assume
- args.os_version, # operating system version
- args.os_patch_level)) # security patch level
+ args.pagesize)) # flash page size we assume
+ args.output.write(pack('8x')) # future expansion: should be 0
args.output.write(pack('16s', args.board.encode())) # asciiz product name
args.output.write(pack('512s', args.cmdline[:512].encode()))
@@ -99,18 +97,6 @@
def parse_int(x):
return int(x, 0)
-def match_to_int(x):
- if (x and x.lastindex == 3):
- return (parse_int(x.group(3)) +
- parse_int(x.group(2)) * 100 +
- parse_int(x.group(1)) * 10000)
- return 0
-
-def parse_os_version(x):
- return match_to_int(re.search(r'^(\d+)\.(\d{1,2})\.(\d{1,2})', x))
-
-def parse_os_patch_level(x):
- return match_to_int(re.search(r'^(\d{4,})-(\d{2})-(\d{2})', x))
def parse_cmdline():
parser = ArgumentParser()
@@ -125,10 +111,6 @@
parser.add_argument('--ramdisk_offset', help='ramdisk offset', type=parse_int, default=0x01000000)
parser.add_argument('--second_offset', help='2nd bootloader offset', type=parse_int,
default=0x00f00000)
- parser.add_argument('--os_version', help='operating system version', type=parse_os_version,
- default=0)
- parser.add_argument('--os_patch_level', help='operating system patch level',
- type=parse_os_patch_level, default=0)
parser.add_argument('--tags_offset', help='tags offset', type=parse_int, default=0x00000100)
parser.add_argument('--board', help='board name', default='', action=ValidateStrLenAction,
maxlen=16)