qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disk: part: auto append android a/b slot suffix when query partition 

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I13d6e46f362c0f2d50824fd6bc858521d2d35433
This commit is contained in:
Jason Zhu 2020-04-27 17:45:54 +08:00
parent 1e33e3cb7c
commit e68ead627b
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
disk/part.c
View File

@ -11,6 +11,9 @@
#include <ide.h> #include <ide.h>
#include <malloc.h> #include <malloc.h>
#include <part.h> #include <part.h>
#ifdef CONFIG_SPL_AB
#include <spl_ab.h>
#endif
#include <ubifs_uboot.h> #include <ubifs_uboot.h>
#ifdef CONFIG_ANDROID_AB #ifdef CONFIG_ANDROID_AB
#include <android_avb/avb_ops_user.h> #include <android_avb/avb_ops_user.h>
@ -671,7 +674,6 @@ cleanup:
return ret; return ret;
} }
#ifdef CONFIG_ANDROID_AB
/* /*
* For android A/B system, we append the current slot suffix quietly, * For android A/B system, we append the current slot suffix quietly,
* this takes over the responsibility of slot suffix appending from * this takes over the responsibility of slot suffix appending from
@ -688,14 +690,18 @@ int part_get_info_by_name(struct blk_desc *dev_desc, const char *name,
part_drv = part_driver_lookup_type(dev_desc); part_drv = part_driver_lookup_type(dev_desc);
if (!part_drv) if (!part_drv)
return -1; return -1;
#ifndef CONFIG_SPL_BUILD #if defined(CONFIG_ANDROID_AB) && !defined(CONFIG_SPL_BUILD)
/* 1. Query partition with A/B slot suffix */ /* 1. Query partition with A/B slot suffix */
if (rk_avb_append_part_slot(name, name_slot)) if (rk_avb_append_part_slot(name, name_slot))
return -1; return -1;
#elif defined(CONFIG_SPL_AB) && defined(CONFIG_SPL_BUILD)
if (spl_ab_append_part_slot(dev_desc, name, name_slot))
return -1;
#else
strcpy(name_slot, name);
#endif #endif
retry: retry:
debug("## Query partition(%d): %s\n", none_slot_try, name_slot); debug("## Query partition(%d): %s\n", none_slot_try, name_slot);
for (i = 1; i < part_drv->max_entries; i++) { for (i = 1; i < part_drv->max_entries; i++) {
ret = part_drv->get_info(dev_desc, i, info); ret = part_drv->get_info(dev_desc, i, info);
if (ret != 0) { if (ret != 0) {
@ -718,33 +724,6 @@ retry:
return -1; return -1;
} }
#else
int part_get_info_by_name(struct blk_desc *dev_desc, const char *name,
disk_partition_t *info)
{
struct part_driver *part_drv;
int ret;
int i;
part_drv = part_driver_lookup_type(dev_desc);
if (!part_drv)
return -1;
for (i = 1; i < part_drv->max_entries; i++) {
ret = part_drv->get_info(dev_desc, i, info);
if (ret != 0) {
/* no more entries in table */
break;
}
if (strcmp(name, (const char *)info->name) == 0) {
/* matched */
return i;
}
}
return -1;
}
#endif
void part_set_generic_name(const struct blk_desc *dev_desc, void part_set_generic_name(const struct blk_desc *dev_desc,
int part_num, char *name) int part_num, char *name)
{ {