diff options
| author | Siddeswar Aluganti <salugant@codeaurora.org> | 2021-04-14 12:57:58 -0700 |
|---|---|---|
| committer | Siddeswar Aluganti <salugant@codeaurora.org> | 2021-04-14 13:19:35 -0700 |
| commit | 4b6405a7f0b4d52e6266683ba49c3e83c5b16e32 (patch) | |
| tree | 6903a304b510f6d1c9bee95bf6f301424ea8a280 | |
| parent | 96bff3bdda1b9fd18fc16f674aed4fcfe0488893 (diff) | |
Handle "multiimgoem", "multiimgqti" partitions.
Handle "multiimgoem", "multiimgqti" partitions, similar to other
partitions in BOOT LUN.
Change-Id: I41c3458af4520ac28b7a72ae300cebd74a4db00c
CRs-Fixed:: 2897043
| -rw-r--r-- | 1.1/libboot_control_qti/libboot_control_qti.cpp | 14 | ||||
| -rw-r--r-- | boot_control.cpp | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp index f476e95..1a36300 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/1.1/libboot_control_qti/libboot_control_qti.cpp @@ -513,14 +513,12 @@ int set_active_boot_slot(unsigned slot) //actual names. To do this we append the slot suffix to every member //in the list. for (i = 0; i < ARRAY_SIZE(ptn_list); i++) { - //XBL & XBL_CFG are handled differrently for ufs devices so - //ignore them - if (is_ufs && (!strncmp(ptn_list[i], - PTN_XBL, - strlen(PTN_XBL)) - || !strncmp(ptn_list[i], - PTN_XBL_CFG, - strlen(PTN_XBL_CFG)))) + //XBL, XBL_CFG, MULTIIMGOEM, MULTIIMGQTI are handled differrently + //for ufs devices so ignore them. + if (is_ufs && (!strncmp(ptn_list[i],PTN_XBL,strlen(PTN_XBL)) + || !strncmp(ptn_list[i],PTN_XBL_CFG,strlen(PTN_XBL_CFG)) + || !strncmp(ptn_list[i],PTN_MULTIIMGOEM,strlen(PTN_MULTIIMGOEM)) + || !strncmp(ptn_list[i],PTN_MULTIIMGQTI,strlen(PTN_MULTIIMGQTI)))) continue; //The partition list will be the list of _a partitions string cur_ptn = ptn_list[i]; diff --git a/boot_control.cpp b/boot_control.cpp index 899b6e2..6e11d2e 100644 --- a/boot_control.cpp +++ b/boot_control.cpp @@ -536,14 +536,12 @@ int set_active_boot_slot(struct boot_control_module *module, unsigned slot) //actual names. To do this we append the slot suffix to every member //in the list. for (i = 0; i < ARRAY_SIZE(ptn_list); i++) { - //XBL & XBL_CFG are handled differrently for ufs devices so - //ignore them - if (is_ufs && (!strncmp(ptn_list[i], - PTN_XBL, - strlen(PTN_XBL)) - || !strncmp(ptn_list[i], - PTN_XBL_CFG, - strlen(PTN_XBL_CFG)))) + //XBL, XBL_CFG, MULTIIMGOEM, MULTIIMGQTI are handled differrently + //for ufs devices so ignore them. + if (is_ufs && (!strncmp(ptn_list[i],PTN_XBL,strlen(PTN_XBL)) + || !strncmp(ptn_list[i],PTN_XBL_CFG,strlen(PTN_XBL_CFG)) + || !strncmp(ptn_list[i],PTN_MULTIIMGOEM,strlen(PTN_MULTIIMGOEM)) + || !strncmp(ptn_list[i],PTN_MULTIIMGQTI,strlen(PTN_MULTIIMGQTI)))) continue; //The partition list will be the list of _a partitions string cur_ptn = ptn_list[i]; |