mirror of
https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git
synced 2025-12-10 07:44:53 +01:00
pack: ipq807x: Add support for (HK10 + QCN90xx) changes in single-image
This change involves: 1. pack the hk10 specific system-partition binaries into single-image 2. flash the MIBIB partition based on the machid 3. update the offsets and sizes in the partiton table based on the selected system-partiton image. Note: HK10 changes applicable to nand-2k and norplusnand-2k only. Change-Id: I513e4ffc379ca9a7862e61dab7901f32d5aa9fe6 Signed-off-by: Pavithra Palanisamy <pavip@codeaurora.org>
This commit is contained in:
Pavithra Palanisamy
Gerrit - the friendly Code Review server
parent
944a01b45d
commit
d180270132
1 changed files with 67 additions and 7 deletions
|
|
@ -714,6 +714,8 @@ class Pack(object):
|
|||
|
||||
def __gen_flash_script_image(self, filename, soc_version, file_exists, machid, partition, flinfo, script):
|
||||
|
||||
global IF_HK10
|
||||
|
||||
img_size = 0
|
||||
if file_exists == 1:
|
||||
img_size = self.__get_img_size(filename)
|
||||
|
|
@ -772,6 +774,8 @@ class Pack(object):
|
|||
if machid:
|
||||
script.start_if("machid", machid)
|
||||
|
||||
if section_conf == "mibib" and IF_HK10:
|
||||
section_conf = "mibib_hk10"
|
||||
if section_conf == "qsee":
|
||||
section_conf = "tz"
|
||||
elif section_conf == "appsbl":
|
||||
|
|
@ -783,6 +787,8 @@ class Pack(object):
|
|||
section_conf = "ubi"
|
||||
elif section_conf == "wififw" and self.flash_type in ["nand", "nand-4k", "nand-audio", "nand-audio-4k", "norplusnand", "norplusnand-4k"]:
|
||||
section_conf = "wififw_ubi"
|
||||
if IF_HK10:
|
||||
section_conf = "wififw_ubi_hk10"
|
||||
|
||||
if soc_version:
|
||||
section_conf = section_conf + "_v" + str(soc_version)
|
||||
|
|
@ -843,6 +849,7 @@ class Pack(object):
|
|||
global MODE
|
||||
global SRC_DIR
|
||||
global ARCH_NAME
|
||||
global IF_HK10
|
||||
|
||||
diff_files = ""
|
||||
count = 0
|
||||
|
|
@ -853,7 +860,10 @@ class Pack(object):
|
|||
if self.flash_type == "norplusemmc" and flinfo.type == "emmc":
|
||||
srcDir_part = SRC_DIR + "/" + ARCH_NAME + "/flash_partition/" + flinfo.type + "-partition.xml"
|
||||
else:
|
||||
srcDir_part = SRC_DIR + "/" + ARCH_NAME + "/flash_partition/" + self.flash_type.lower() + "-partition.xml"
|
||||
if IF_HK10:
|
||||
srcDir_part = SRC_DIR + "/" + ARCH_NAME + "/flash_partition/" + self.flash_type.lower() + "-partition-hk10.xml"
|
||||
else:
|
||||
srcDir_part = SRC_DIR + "/" + ARCH_NAME + "/flash_partition/" + self.flash_type.lower() + "-partition.xml"
|
||||
|
||||
root_part = ET.parse(srcDir_part)
|
||||
if self.flash_type != "emmc" and flinfo.type != "emmc":
|
||||
|
|
@ -1081,6 +1091,8 @@ class Pack(object):
|
|||
|
||||
def __gen_script_append_images(self, filename, soc_version, images, flinfo, root, section_conf, partition):
|
||||
|
||||
global HK10
|
||||
|
||||
part_info = self.__get_part_info(partition)
|
||||
if part_info == None and self.flinfo.type != 'norplusnand':
|
||||
return
|
||||
|
|
@ -1127,6 +1139,7 @@ class Pack(object):
|
|||
"""
|
||||
global MODE
|
||||
global SRC_DIR
|
||||
global HK10
|
||||
|
||||
soc_version = 0
|
||||
diff_soc_ver_files = 0
|
||||
|
|
@ -1137,6 +1150,9 @@ class Pack(object):
|
|||
if ret == 0:
|
||||
return 0 #Stop packing this single-image
|
||||
|
||||
if HK10:
|
||||
script.end_if() #end if started for hk10+pine
|
||||
|
||||
if (self.flash_type == "norplusemmc" and flinfo.type == "emmc") or (self.flash_type != "norplusemmc"):
|
||||
if flinfo.type == "emmc":
|
||||
script.start_activity("Flashing rootfs_data:")
|
||||
|
|
@ -1281,6 +1297,11 @@ class Pack(object):
|
|||
for img in imgs:
|
||||
soc_version = img.get('soc_version')
|
||||
filename = img.text
|
||||
if HK10 and section_conf == "wififw":
|
||||
filename_hk10 = filename.replace("wifi_fw_ubi", "wifi_fw_ipq8074_qcn9000_ubi")
|
||||
if os.path.exists(os.path.join(self.images_dname, filename_hk10)):
|
||||
section_conf_hk10 = section_conf + "_ubi_hk10"
|
||||
self.__gen_script_append_images(filename_hk10, soc_version, images, flinfo, root, section_conf_hk10, partition)
|
||||
if 'optional' in img.attrib:
|
||||
if not os.path.exists(os.path.join(self.images_dname, filename)):
|
||||
file_exists = 0
|
||||
|
|
@ -1293,6 +1314,13 @@ class Pack(object):
|
|||
except KeyError, e:
|
||||
continue
|
||||
|
||||
# system-partition specific for HK10+PINE
|
||||
if section_conf == "mibib" and HK10:
|
||||
img = section.find('img_name')
|
||||
filename_hk10 = img.text[:-4] + "-hk10.bin"
|
||||
section_conf_hk10 = section_conf + "_hk10"
|
||||
self.__gen_script_append_images(filename_hk10, soc_version, images, flinfo, root, section_conf_hk10, partition)
|
||||
|
||||
else:
|
||||
if diff_soc_ver_files:
|
||||
try:
|
||||
|
|
@ -1364,6 +1392,8 @@ class Pack(object):
|
|||
def __gen_board_script(self, flinfo, part_fname, images, root):
|
||||
global SRC_DIR
|
||||
global ARCH_NAME
|
||||
global HK10
|
||||
global IF_HK10
|
||||
|
||||
"""Generate the flashing script for one board.
|
||||
|
||||
|
|
@ -1374,7 +1404,9 @@ class Pack(object):
|
|||
fconf_fname -- string, flash config file specific to the board
|
||||
images -- list of ImageInfo, append images used by the board here
|
||||
"""
|
||||
IF_HK10 = False
|
||||
script_fp = open(self.scr_fname, "a")
|
||||
self.flinfo = flinfo
|
||||
|
||||
if flinfo.type != "emmc":
|
||||
if root.find(".//data[@type='NAND_PARAMETER']/entry") != None:
|
||||
|
|
@ -1397,25 +1429,46 @@ class Pack(object):
|
|||
|
||||
srcDir_part = SRC_DIR + "/" + ARCH_NAME + "/flash_partition/" + flinfo.type + "-partition.xml"
|
||||
root_part = ET.parse(srcDir_part)
|
||||
mibib = MIBIB(part_fname, flinfo.pagesize, flinfo.blocksize,
|
||||
flinfo.chipsize, blocksize, chipsize, root_part)
|
||||
self.partitions = mibib.get_parts()
|
||||
|
||||
if flinfo.type == "nand":
|
||||
script = Flash_Script(flinfo, self.ipq_nand)
|
||||
elif flinfo.type == "nor":
|
||||
script = Flash_Script(flinfo, pagesize)
|
||||
|
||||
script.probe()
|
||||
# system-partition specific for HK10+PINE
|
||||
if HK10:
|
||||
IF_HK10 = True
|
||||
part_fname_hk10 = part_fname[:-4] + "-hk10.bin"
|
||||
mibib_hk10 = MIBIB(part_fname_hk10, flinfo.pagesize, flinfo.blocksize,
|
||||
flinfo.chipsize, blocksize, chipsize, root_part)
|
||||
self.partitions = mibib_hk10.get_parts()
|
||||
|
||||
script.append('if test "$machid" = "801000e" || test "$machid" = "801010e"; then\n', fatal=False)
|
||||
ret = self.__gen_flash_script(script, flinfo, root)
|
||||
if ret == 0:
|
||||
return 0 #Issue in packing hk10+pine single-image
|
||||
|
||||
script.append('else', fatal=False)
|
||||
self.partitions = {}
|
||||
IF_HK10 = False
|
||||
|
||||
mibib = MIBIB(part_fname, flinfo.pagesize, flinfo.blocksize,
|
||||
flinfo.chipsize, blocksize, chipsize, root_part)
|
||||
self.partitions = mibib.get_parts()
|
||||
|
||||
else:
|
||||
gpt = GPT(part_fname, flinfo.pagesize, flinfo.blocksize, flinfo.chipsize)
|
||||
self.partitions = gpt.get_parts()
|
||||
script = Flash_Script(flinfo)
|
||||
|
||||
self.flinfo = flinfo
|
||||
|
||||
script.probe()
|
||||
ret = self.__gen_script(script_fp, script, images, flinfo, root)
|
||||
if ret == 0:
|
||||
return 0
|
||||
|
||||
if HK10:
|
||||
HK10 = False
|
||||
|
||||
try:
|
||||
script_fp.write(script.dumps())
|
||||
except IOError, e:
|
||||
|
|
@ -1464,6 +1517,7 @@ class Pack(object):
|
|||
global SRC_DIR
|
||||
global ARCH_NAME
|
||||
global MODE
|
||||
global HK10
|
||||
|
||||
try:
|
||||
if ftype == "tiny-nor":
|
||||
|
|
@ -1542,6 +1596,9 @@ class Pack(object):
|
|||
pages_per_block = int(part_info.find(".//pages_per_block").text)
|
||||
blocks_per_chip = int(part_info.find(".//total_block").text)
|
||||
|
||||
if ARCH_NAME == "ipq807x" and (ftype == "norplusnand" or ftype == "nand"):
|
||||
HK10 = True
|
||||
|
||||
if ftype in ["tiny-nor", "norplusnand", "norplusnand-4k", "norplusemmc"]:
|
||||
ftype = "nor"
|
||||
if ftype in ["nand-4k", "nand-audio", "nand-audio-4k"]:
|
||||
|
|
@ -1560,6 +1617,9 @@ class Pack(object):
|
|||
|
||||
def __process_board(self, images, root):
|
||||
|
||||
global HK10
|
||||
|
||||
HK10 = False
|
||||
try:
|
||||
if self.flash_type in [ "nand", "nand-4k", "nand-audio", "nand-audio-4k", "nor", "tiny-nor", "norplusnand", "norplusnand-4k" ]:
|
||||
ret = self.__process_board_flash(self.flash_type, images, root)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue