pack.py: Updated to support lkboot single image

LK bootloader needs kernel image with a different
image header format. Hence, we need to pack the
single image with a custom kernel image.

Change-Id: I326fa92a72beace40f92753eac13b638705aeb14
Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
This commit is contained in:
Gokul Sriram Palanisamy 2019-01-09 10:27:00 +05:30 committed by Gerrit - the friendly Code Review server
parent 8338952d77
commit 41eae48e0d
2 changed files with 20 additions and 0 deletions

View file

@ -933,6 +933,11 @@ class Pack(object):
try:
if image_type == "all" or section.attrib['image_type'] == image_type:
filename = section.attrib['filename_' + MODE]
if lk == "true" and "uImage" in filename:
if MODE == "32":
filename = 'openwrt-' + ARCH_NAME + '-kernelboot.img'
if MODE == "64":
filename = 'openwrt-' + ARCH_NAME + '_' + MODE + '-kernelboot.img'
partition = section.attrib['label']
if filename == "":
continue
@ -1203,6 +1208,11 @@ class Pack(object):
try:
if image_type == "all" or section.attrib['image_type'] == image_type:
filename = section.attrib['filename_' + MODE]
if lk == "true" and "uImage" in filename:
if MODE == "32":
filename = 'openwrt-' + ARCH_NAME + '-kernelboot.img'
if MODE == "64":
filename = 'openwrt-' + ARCH_NAME + '_' + MODE + '-kernelboot.img'
partition = section.attrib['label']
if filename == "":
continue

View file

@ -724,6 +724,11 @@ class Pack(object):
filename = "openwrt-ipq40xx-lkboot-stripped.elf"
elif "ipq806x" in filename:
filename = "openwrt-ipq806x-lkboot.mbn"
if lk == True and "uImage" in filename and self.flinfo.type == 'emmc':
if "ipq40xx" in filename:
filename = "openwrt-ipq40xx-kernelboot.img"
elif "ipq806x" in filename:
filename = "openwrt-ipq806x-kernelboot.img"
partition = info.get(section, "partition")
include = info.get(section, "include")
except ConfigParserError, e:
@ -852,6 +857,11 @@ class Pack(object):
filename = "openwrt-ipq40xx-lkboot-stripped.elf"
elif "ipq806x" in filename:
filename = "openwrt-ipq806x-lkboot.mbn"
if lk == True and "uImage" in filename:
if "ipq40xx" in filename:
filename = "openwrt-ipq40xx-kernelboot.img"
elif "ipq806x" in filename:
filename = "openwrt-ipq806x-kernelboot.img"
img_size = self.__get_img_size(filename)
size = roundup(img_size, flinfo.blocksize)
if ( size != img_size ):