pack: Modify QCN9100 to QCN6122 for Spruce

Signed-off-by: Pavithra Palanisamy <pavip@codeaurora.org>
Change-Id: Id39e432528603778d125ba69638b26bb7e74f41e
This commit is contained in:
Pavithra Palanisamy 2020-12-16 20:09:59 +05:30 committed by Gerrit - the friendly Code Review server
parent 498556e135
commit c8abb25330

View file

@ -89,7 +89,7 @@ memory_size = "default"
lk = "false"
skip_4k_nand = "false"
atf = "false"
qcn9100 = "false"
qcn6122 = "false"
tiny_16m = "false"
# Note: ipq806x didn't expose any relevant version */
@ -1247,7 +1247,7 @@ class Pack(object):
try:
diff_soc_ver_files = section.attrib['diff_soc_ver_files']
except KeyError, e:
if (qcn9100 == "true" or tiny_16m == "true") and 'wififw_type_min' in section.attrib:
if (qcn6122 == "true" or tiny_16m == "true") and 'wififw_type_min' in section.attrib:
wifi_fw_type_min = section.attrib['wififw_type_min']
wifi_fw_type_max = section.attrib['wififw_type_max']
else:
@ -1313,7 +1313,7 @@ class Pack(object):
if flinfo.type != "emmc":
img = section.find('img_name')
if img != None and 'wififw_type' in img.attrib and (qcn9100 == "true" or tiny_16m == "true"):
if img != None and 'wififw_type' in img.attrib and (qcn6122 == "true" or tiny_16m == "true"):
imgs = section.findall('img_name')
try:
for img in imgs:
@ -1410,7 +1410,7 @@ class Pack(object):
if ret == 0:
return 0
if self.flash_type in [ "nand", "nand-4k", "norplusnand", "norplusnand-4k" ] and partition == "rootfs" and qcn9100 == "true":
if self.flash_type in [ "nand", "nand-4k", "norplusnand", "norplusnand-4k" ] and partition == "rootfs" and qcn6122 == "true":
fw_imgs = section.findall('img_name')
for fw_img in fw_imgs:
@ -1689,7 +1689,7 @@ class Pack(object):
diff_soc_ver_files = section.attrib['diff_soc_ver_files']
partition = section.attrib['label']
except KeyError, e:
if (qcn9100 == "true" or tiny_16m == "true") and 'wififw_type_min' in section.attrib:
if (qcn6122 == "true" or tiny_16m == "true") and 'wififw_type_min' in section.attrib:
wifi_fw_type_min = section.attrib['wififw_type_min']
wifi_fw_type_max = section.attrib['wififw_type_max']
partition = section.attrib['label']
@ -1755,7 +1755,7 @@ class Pack(object):
img = section.find('img_name')
if img != None and 'wififw_type' in img.attrib and (qcn9100 == "true" or tiny_16m == "true"):
if img != None and 'wififw_type' in img.attrib and (qcn6122 == "true" or tiny_16m == "true"):
imgs = section.findall('img_name')
try:
for img in imgs:
@ -1860,7 +1860,7 @@ class Pack(object):
if filename != "":
self.__gen_script_append_images(filename, soc_version, wifi_fw_type, images, flinfo, root, section_conf, partition)
if self.flash_type in [ "nand", "nand-4k", "norplusnand", "norplusnand-4k" ] and section_conf == "rootfs" and qcn9100 == "true":
if self.flash_type in [ "nand", "nand-4k", "norplusnand", "norplusnand-4k" ] and section_conf == "rootfs" and qcn6122 == "true":
fw_imgs = section.findall('img_name')
try:
@ -2210,7 +2210,7 @@ class ArgParser(object):
global lk
global atf
global skip_4k_nand
global qcn9100
global qcn6122
"""Start the parsing process, and populate members with parsed value.
@ -2220,7 +2220,7 @@ class ArgParser(object):
cdir = os.path.abspath(os.path.dirname(""))
if len(sys.argv) > 1:
try:
opts, args = getopt(sys.argv[1:], "", ["arch=", "fltype=", "srcPath=", "inImage=", "outImage=", "image_type=", "memory=", "lk", "skip_4k_nand", "atf", "qcn9100"])
opts, args = getopt(sys.argv[1:], "", ["arch=", "fltype=", "srcPath=", "inImage=", "outImage=", "image_type=", "memory=", "lk", "skip_4k_nand", "atf", "qcn6122"])
except GetoptError, e:
raise UsageError(e.msg)
@ -2255,8 +2255,8 @@ class ArgParser(object):
elif option =="--skip_4k_nand":
skip_4k_nand = "true"
elif option == "--qcn9100":
qcn9100 = "true"
elif option == "--qcn6122":
qcn6122 = "true"
#Verify Arguments passed by user