wen/luban-lite
1
0
Fork 0
mirror of https://gitee.com/Vancouver2017/luban-lite.git synced 2025-12-15 16:48:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

v1.0.2: fix-windows-package-image-header

Browse Source
This commit is contained in:
刘可亮
2023-12-25 19:56:21 +08:00
parent 0397775c80
commit d3bd993b5f
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/scripts/mk_image.exe
View File

Binary file not shown.

23
tools/scripts/mk_image.py
View File

@@ -663,9 +663,9 @@ def itb_create_image(itsname, itbname, keydir, dtbname, script_dir):
# If the key exists, generate image signature information and write it to the itb file. # If the key exists, generate image signature information and write it to the itb file.
# If the key exists, write the public key to the dtb file. # If the key exists, write the public key to the dtb file.
if keydir != None and dtbname != None: if keydir != None and dtbname != None:
cmd = [mkcmd, "-E", "-f", itsname, "-k", keydir, "-K", dtbname, "-r", itbname] cmd = [mkcmd, "-E", "-B 0x800", "-f", itsname, "-k", keydir, "-K", dtbname, "-r", itbname]
else: else:
cmd = [mkcmd, "-E", "-f", itsname, itbname] cmd = [mkcmd, "-E", "-B 0x800", "-f", itsname, itbname]
ret = subprocess.run(cmd, stdout=subprocess.PIPE) ret = subprocess.run(cmd, stdout=subprocess.PIPE)
if ret.returncode != 0: if ret.returncode != 0:
@@ -1207,37 +1207,38 @@ def generate_bootcfg(bcfgfile, cfg):
"# Packed image file is example.img, boot1 use it.\n", "# Packed image file is example.img, boot1 use it.\n",
"\n\n", "\n\n",
] ]
bcfgfile.writelines(comments) bytes_comments = [comment.encode() for comment in comments]
bcfgfile.writelines(bytes_comments)
fwcset = cfg["image"]["updater"] fwcset = cfg["image"]["updater"]
fwckeys = cfg["image"]["updater"].keys() fwckeys = cfg["image"]["updater"].keys()
if "spl" in fwckeys: if "spl" in fwckeys:
fwcname = "spl" fwcname = "spl"
linestr = "# {}\n".format(fwcset[fwcname]["file"]) linestr = "# {}\n".format(fwcset[fwcname]["file"])
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
linestr = "boot0={}@{}\n".format(hex(fwcset[fwcname]["filesize"]), linestr = "boot0={}@{}\n".format(hex(fwcset[fwcname]["filesize"]),
hex(fwcset[fwcname]["file_off"])) hex(fwcset[fwcname]["file_off"]))
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
if "uboot" in fwckeys: if "uboot" in fwckeys:
fwcname = "uboot" fwcname = "uboot"
linestr = "# {}\n".format(fwcset[fwcname]["file"]) linestr = "# {}\n".format(fwcset[fwcname]["file"])
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
linestr = "boot1={}@{}\n".format(hex(fwcset[fwcname]["filesize"]), linestr = "boot1={}@{}\n".format(hex(fwcset[fwcname]["filesize"]),
hex(fwcset[fwcname]["file_off"])) hex(fwcset[fwcname]["file_off"]))
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
if "env" in fwckeys: if "env" in fwckeys:
fwcname = "env" fwcname = "env"
linestr = "# {}\n".format(fwcset[fwcname]["file"]) linestr = "# {}\n".format(fwcset[fwcname]["file"])
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
linestr = "env={}@{}\n".format(hex(fwcset[fwcname]["filesize"]), linestr = "env={}@{}\n".format(hex(fwcset[fwcname]["filesize"]),
hex(fwcset[fwcname]["file_off"])) hex(fwcset[fwcname]["file_off"]))
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
imgfn = img_gen_fw_file_name(cfg) imgfn = img_gen_fw_file_name(cfg)
linestr = "image={}\n".format(imgfn) linestr = "image={}\n".format(imgfn)
bcfgfile.write(linestr) bcfgfile.write(linestr.encode())
bcfgfile.flush() bcfgfile.flush()
def get_spinand_image_list(cfg, datadir): def get_spinand_image_list(cfg, datadir):
@@ -1356,7 +1357,7 @@ def build_firmware_image(cfg, datadir):
print("\tImage file is generated: {}/{}\n\n".format(img_path, img_name)) print("\tImage file is generated: {}/{}\n\n".format(img_path, img_name))
bootcfg_fn = datadir + cfg["image"]["bootcfg"] bootcfg_fn = datadir + cfg["image"]["bootcfg"]
with open(bootcfg_fn, 'w') as bcfgfile: with open(bootcfg_fn, 'wb') as bcfgfile:
generate_bootcfg(bcfgfile, cfg) generate_bootcfg(bcfgfile, cfg)
bcfgfile.flush() bcfgfile.flush()
return 0 return 0

BIN
tools/scripts/mk_private_resource.exe
View File

Binary file not shown.