From b2c1ec334dd3ed358a014472fb0c22b966e59e46 Mon Sep 17 00:00:00 2001
From: Timple Raj M <quic_timple@quicinc.com>
Date: Fri, 29 Sep 2023 19:43:34 +0530
Subject: [PATCH] pack_v2: Update the image_type condition check for 0:WIFIFW

This patch updates the image_type condition check
for 0:WIFIFW since emmc-partition.xml each partition
information is parsed in single xml tag but for other
partition.xml files each partition information is
mentioned in multiple xml tags

For Example

ipq5332/flash_partition/tiny-nor-partition.xml

<partition>
        <name length="16" type="string">0:WIFIFW</name>
        <size_kb length="4">5500</size_kb>
        <pad_kb length="2">0</pad_kb>
        <which_flash length="2">0</which_flash>
        <attr>0xFF</attr>
        <attr>0xFF</attr>
        <attr>0x00</attr>
        <attr>0xFF</attr>
        <img_name image_type="hlos" optional="true" type="string"
wififw_type="1">wifi_fw_ipq5332_qcn6432_squashfs.img </img_name>
</partition>

ipq5332/flash_partition/emmc-partition.xml

<partition
        label="0:WIFIFW"
        size_in_kb="12288"
        type="888d8069-8d27-40a8-95a9-6006e1ce9b3b"
        bootable="false"
        readonly="false"
        image_type = "hlos"
        optional="true"
        filename="wifi_fw_ipq5332_qcn9224_v2_single_dualmac_squashfs.img"
        />

Change-Id: I1b5835b0835f2c05958924ad6ce5f403e934aac4
Signed-off-by: Timple Raj M <quic_timple@quicinc.com>
---
 tools/pack_v2.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/pack_v2.py b/tools/pack_v2.py
index 46f0186a26..a647c7b1f7 100644
--- a/tools/pack_v2.py
+++ b/tools/pack_v2.py
@@ -1046,7 +1046,12 @@ class Pack(object):
                     if no_fw_mach_ids and filename != "":
                         self.__gen_flash_script_update_for_wififw(partition, filename, flinfo, script, no_fw_mach_ids)
 
-                    if image_type == "all" or section.attrib['image_type'] == image_type:
+                    if flinfo.type == "emmc":
+                        section_img_type = section.attrib['image_type']
+                    else:
+                        section_img_type = section[8].attrib['image_type']
+
+                    if image_type == "all" or section_img_type == image_type:
                         for wifi_fw_type in wifi_fw_list:
                             fw_name = wifi_fw_type
                             if fw_name == "":