mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-11 11:38:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "pack.py: included lkboot in single image"

Browse source
This commit is contained in:
Linux Build Service Account 2018-12-31 13:04:35 -08:00 • committed by Gerrit - the friendly Code Review server
commit b38b3905e6
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/pack_legacy.py
View file

@ -83,6 +83,7 @@ import re
import hashlib
version = "1.1"
lk = False
TABLE_VERSION_AK = 3
TABLE_VERSION_DK = 4
@ -718,6 +719,11 @@ class Pack(object):
for section in info.sections():
try:
filename = info.get(section, "filename")
if lk == True and "u-boot" in filename and self.flinfo.type == 'emmc':
if "ipq40xx" in filename:
filename = "openwrt-ipq40xx-lkboot-stripped.elf"
elif "ipq806x" in filename:
filename = "openwrt-ipq806x-lkboot.mbn"
partition = info.get(section, "partition")
include = info.get(section, "include")
except ConfigParserError, e:
@ -841,6 +847,11 @@ class Pack(object):
if ( size != img_size ):
filename = filename + ".padded"
if self.flinfo.type == 'emmc':
if lk == True and "u-boot" in filename:
if "ipq40xx" in filename:
filename = "openwrt-ipq40xx-lkboot-stripped.elf"
elif "ipq806x" in filename:
filename = "openwrt-ipq806x-lkboot.mbn"
img_size = self.__get_img_size(filename)
size = roundup(img_size, flinfo.blocksize)
if ( size != img_size ):
@ -1404,9 +1415,10 @@ class ArgParser(object):
bconf = False
bconf_fname = None
genitb_fname = None
global lk
try:
opts, args = getopt(argv[1:], "Bib:hp:t:o:c:m:f:F:M:")
opts, args = getopt(argv[1:], "Bib:hp:t:o:c:m:f:F:M:", ["lk"])
except GetoptError, e:
raise UsageError(e.msg)
@ -1433,6 +1445,8 @@ class ArgParser(object):
bconf_fname = value
elif option == "-M":
genitb_fname= value
elif option == "--lk":
lk = True
if len(args) != 1:
raise UsageError("insufficient arguments")