tequilaOS/platform_device_motorola_sm6225-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sm6225-common: bootctrl: Fix logic for emmc devices

Browse source 
Change-Id: Ie113bba941e5e7b8da3ecd87f22a6f8b78dd797e
Signed-off-by: electimon <electimon@gmail.com>
This commit is contained in:
electimon 2023-06-30 11:43:10 +00:00 committed by Michael Bestas
parent bceece86cf
commit 07b9309e97
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bootctrl/1.1/libboot_control_qti/libboot_control_qti.cpp
View file

@ -345,12 +345,25 @@ static int boot_ctl_set_active_slot_for_partitions(vector<string> part_list,
if (!diskB)
goto error;
}
//If the disks are the same should use old logic
//emmc devices are not split disks so it will fail
//to switch
if (!strncmp(diskA->devpath, diskB->devpath, PATH_MAX)) {
gpt_disk_free(diskB);
diskB = NULL;
}
//Get partition entry for slot A & B from the primary
//and backup tables.
pentryA = gpt_disk_get_pentry(diskA, slotA, PRIMARY_GPT);
pentryA_bak = gpt_disk_get_pentry(diskA, slotA, SECONDARY_GPT);
pentryB = gpt_disk_get_pentry(diskB, slotB, PRIMARY_GPT);
pentryB_bak = gpt_disk_get_pentry(diskB, slotB, SECONDARY_GPT);
if (diskB) {
pentryB = gpt_disk_get_pentry(diskB, slotB, PRIMARY_GPT);
pentryB_bak = gpt_disk_get_pentry(diskB, slotB, SECONDARY_GPT);
} else {
pentryB = gpt_disk_get_pentry(diskA, slotB, PRIMARY_GPT);
pentryB_bak = gpt_disk_get_pentry(diskA, slotB, SECONDARY_GPT);
}
if ( !pentryA || !pentryA_bak || !pentryB || !pentryB_bak) {
//None of these should be NULL since we have already
//checked for A & B versions earlier.