tools: pack_v2: resolving wifi fw section name mis-match

This patch resolves the wififw section name mis-match for
the nor flash types.

In image info, wififw-SHA-HASH is used, whereas in the scripts
wifi_fw_ipq5332_qcn6432-SHA-HASH is used. It occur on nor-only build.
For nand/nor+nand, wifi usually in the ubi volume. Incase of
emmc, it is properly taken care.

So, handled all nor-only cases (including tiny-nor) as
similar as emmc case.

Change-Id: I3741a8255da487ad0546d9706933d19f1b1a3a93
Signed-off-by: Ram Kumar D <quic_ramd@quicinc.com>
This commit is contained in:
Ram Kumar D 2023-09-25 14:35:37 +05:30
parent 5f169ad23b
commit 8104d45265

View file

@ -1414,30 +1414,30 @@ class Pack(object):
filename = img.text;
else:
# wififw images specific for RDP based on machid
if section_conf == "wififw":
if ver_check:
for k, v in wifi_fws_avail.items():
self.__gen_script_append_images(k, soc_version, 1, images, flinfo, root, section_conf, partition)
else:
for wifi_fw_type in wifi_fw_list:
fw_name = wifi_fw_type
if fw_name == "":
continue
if not os.path.exists(os.path.join(self.images_dname, fw_name)):
return 0
self.__gen_script_append_images(fw_name, soc_version, wifi_fw_type, images, flinfo, root, section_conf, partition)
wifi_fw_type = ""
fw_name = ""
continue
if section != None and filename != "" and section.get('filename_mem' + memory_size) != None:
filename = section.get('filename_mem' + memory_size)
if section != None and atf == "true" and section.get('filename_atf') != None:
filename = section.get('filename_atf')
# wififw images specific for RDP based on machid
if self.flash_type in [ "emmc" , "tiny-nor", "tiny-nor-debug", "nor" ] and section_conf == "wififw":
if ver_check:
for k, v in wifi_fws_avail.items():
self.__gen_script_append_images(k, soc_version, 1, images, flinfo, root, section_conf, partition)
else:
for wifi_fw_type in wifi_fw_list:
fw_name = wifi_fw_type
if fw_name == "":
continue
if not os.path.exists(os.path.join(self.images_dname, fw_name)):
return 0
self.__gen_script_append_images(fw_name, soc_version, wifi_fw_type, images, flinfo, root, section_conf, partition)
wifi_fw_type = ""
fw_name = ""
continue
if filename != "":
self.__gen_script_append_images(filename, soc_version, wifi_fw_type, images, flinfo, root, section_conf, partition)