leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fastboot: Move part_get_info_by_name_or_alias after raw_part_get_info_by_name

Browse Source 
This makes the next commit more readable by doing the move now.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson
2021-02-05 09:38:59 -05:00
committed by Marek Vasut
parent f3cf964f2d
commit ae5e6b4e8f
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/fastboot/fb_mmc.c
View File

@@ -28,28 +28,6 @@ struct fb_mmc_sparse {
struct blk_desc *dev_desc; struct blk_desc *dev_desc;
}; };
static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc,
const char *name, struct disk_partition *info)
{
int ret;
ret = part_get_info_by_name(dev_desc, name, info);
if (ret < 0) {
/* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */
char env_alias_name[25 + PART_NAME_LEN + 1];
char *aliased_part_name;
/* check for alias */
strcpy(env_alias_name, "fastboot_partition_alias_");
strncat(env_alias_name, name, PART_NAME_LEN);
aliased_part_name = env_get(env_alias_name);
if (aliased_part_name != NULL)
ret = part_get_info_by_name(dev_desc,
aliased_part_name, info);
}
return ret;
}
static int raw_part_get_info_by_name(struct blk_desc *dev_desc, static int raw_part_get_info_by_name(struct blk_desc *dev_desc,
const char *name, const char *name,
struct disk_partition *info) struct disk_partition *info)
@@ -98,6 +76,28 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc,
return 0; return 0;
} }
static int part_get_info_by_name_or_alias(struct blk_desc *dev_desc,
const char *name, struct disk_partition *info)
{
int ret;
ret = part_get_info_by_name(dev_desc, name, info);
if (ret < 0) {
/* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */
char env_alias_name[25 + PART_NAME_LEN + 1];
char *aliased_part_name;
/* check for alias */
strcpy(env_alias_name, "fastboot_partition_alias_");
strncat(env_alias_name, name, PART_NAME_LEN);
aliased_part_name = env_get(env_alias_name);
if (aliased_part_name != NULL)
ret = part_get_info_by_name(dev_desc,
aliased_part_name, info);
}
return ret;
}
/** /**
* fb_mmc_blk_write() - Write/erase MMC in chunks of FASTBOOT_MAX_BLK_WRITE * fb_mmc_blk_write() - Write/erase MMC in chunks of FASTBOOT_MAX_BLK_WRITE
* *