trivial: add-capsule-header: make it actually work

The result that was being spit out didn't actually work on any of
my test systems.
This commit is contained in:
Mario Limonciello 2019-11-03 22:07:29 -06:00 committed by Mario Limonciello
parent d8af5de97d
commit f603e2df88

View File

@ -7,22 +7,22 @@
import sys import sys
import uuid import uuid
import argparse import argparse
import struct import ctypes
CAPSULE_FLAGS_PERSIST_ACROSS_RESET = 0x00010000 CAPSULE_FLAGS_PERSIST_ACROSS_RESET = 0x00010000
CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE = 0x00020000 CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE = 0x00020000
CAPSULE_FLAGS_INITIATE_RESET = 0x00040000 CAPSULE_FLAGS_INITIATE_RESET = 0x00040000
def main(args): def add_header(infile, outfile, gd, fl=None):
# parse GUID from command line # parse GUID from command line
try: try:
guid = uuid.UUID(args.guid) guid = uuid.UUID(gd)
except ValueError as e: except ValueError as e:
print(e) print(e)
return 1 return 1
import struct
try: try:
with open(args.bin, 'rb') as f: with open(infile, 'rb') as f:
bin_data = f.read() bin_data = f.read()
except FileNotFoundError as e: except FileNotFoundError as e:
print(e) print(e)
@ -45,22 +45,26 @@ def main(args):
bin_data = bin_data[hdrsz_old:] bin_data = bin_data[hdrsz_old:]
# set header flags # set header flags
flags = CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_INITIATE_RESET flags = CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_INITIATE_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE
if args.flags: if fl:
flags = int(args.flags, 16) flags = int(fl, 16)
# build update capsule header # build update capsule header
hdrsz = 4096
imgsz = hdrsz + len(bin_data) imgsz = hdrsz + len(bin_data)
hdr = struct.pack('<16sIII', guid.bytes_le, hdrsz, flags, imgsz) hdr = ctypes.create_string_buffer(hdrsz)
with open(args.cap, 'wb') as f: struct.pack_into('<16sIII', hdr, 0, guid.bytes_le, hdrsz, flags, imgsz)
f.write(hdr + bin_data) with open(outfile, 'wb') as f:
print('Wrote capsule %s' % args.cap) f.write(hdr)
f.write(bin_data)
print('Wrote capsule %s' % outfile)
print('GUID: %s' % guid) print('GUID: %s' % guid)
print('HdrSz: 0x%04x' % hdrsz) print('HdrSz: 0x%04x' % hdrsz)
print('Flags: 0x%04x' % flags) print('Flags: 0x%04x' % flags)
print('PayloadSz: 0x%04x' % imgsz) print('PayloadSz: 0x%04x' % imgsz)
return 0 return 0
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Add capsule header on firmware') parser = argparse.ArgumentParser(description='Add capsule header on firmware')
parser.add_argument('--guid', help='GUID of the device', required=True) parser.add_argument('--guid', help='GUID of the device', required=True)
parser.add_argument('--bin', help='Path to the .bin file', required=True) parser.add_argument('--bin', help='Path to the .bin file', required=True)
@ -68,4 +72,4 @@ parser.add_argument('--cap', help='Output capsule file path', required=True)
parser.add_argument('--flags', help='Flags, e.g. 0x40000', default=None) parser.add_argument('--flags', help='Flags, e.g. 0x40000', default=None)
args = parser.parse_args() args = parser.parse_args()
sys.exit(main(args)) sys.exit(add_header(args.bin, args.cap, args.guid, args.flags))