gpt-utils: Update PTN_SWAP_LIST and handle multiimg(oem/qti)
* Update PTN_SWAP_LIST to reflect partition entry changes
to BOOT LUN and handle "multiimgoem", "multiimgqti"
partitions, similar to other BOOT LUN partitions.
Change-Id: I3fb2934c44f3c2555ef36437ae97c9a47bb874ed
diff --git a/gpt-utils/gpt-utils.cpp b/gpt-utils/gpt-utils.cpp
index 37e91b8..6d05004 100644
--- a/gpt-utils/gpt-utils.cpp
+++ b/gpt-utils/gpt-utils.cpp
@@ -239,11 +239,11 @@
uint8_t *ptn_entry;
uint8_t *ptn_bak_entry;
uint8_t ptn_swap[PTN_ENTRY_SIZE];
- //Skip the xbl partition on UFS devices. That is handled
+ //Skip the xbl, multiimgoem, multiimgqti partitions on UFS devices. That is handled
//seperately.
- if (gpt_utils_is_ufs_device() && !strncmp(ptn_swap_list[i],
- PTN_XBL,
- strlen(PTN_XBL)))
+ if ((gpt_utils_is_ufs_device() && !strncmp(ptn_swap_list[i],PTN_XBL,strlen(PTN_XBL)))
+ || !strncmp(ptn_swap_list[i],PTN_MULTIIMGOEM,strlen(PTN_MULTIIMGOEM))
+ || !strncmp(ptn_swap_list[i],PTN_MULTIIMGQTI,strlen(PTN_MULTIIMGQTI)))
continue;
ptn_entry = gpt_pentry_seek(ptn_swap_list[i], pentries_start,
@@ -970,9 +970,9 @@
//of being loaded based on well known GUID'S.
//We take care of switching the UFS boot LUN
//explicitly later on.
- if (!strncmp(ptn_swap_list[i],
- PTN_XBL,
- strlen(PTN_XBL)))
+ if (!strncmp(ptn_swap_list[i],PTN_XBL,strlen(PTN_XBL))
+ || !strncmp(ptn_swap_list[i],PTN_MULTIIMGOEM,strlen(PTN_MULTIIMGOEM))
+ || !strncmp(ptn_swap_list[i],PTN_MULTIIMGQTI,strlen(PTN_MULTIIMGQTI)))
continue;
snprintf(buf, sizeof(buf),
"%s/%sbak",