psmattas/hardware_oplus-CherishOS
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpt-utils: Update PTN_SWAP_LIST and handle multiimg(oem/qti)

Browse Source 
* 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
This commit is contained in:
Siddeswar Aluganti
2021-04-14 12:04:04 -07:00
committed by LuK1337
parent 128227ffce
commit 4a9dff139c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gpt-utils/gpt-utils.cpp
View File

@@ -239,11 +239,11 @@ static int gpt_boot_chain_swap(const uint8_t *pentries_start,
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 @@ int prepare_boot_update(enum boot_update_stage stage)
//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",