diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-18 09:55:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-18 09:55:32 -0400 |
| commit | 890233ca5569e5787d8407596a12b9fca80952bf (patch) | |
| tree | 966b9beb01a0ca57045bec4b4da2e16cb792757f /include | |
| parent | 13aa090b87a0fbdfe690011669b9fdb96bb1ccc7 (diff) | |
| parent | 4dc5e26242101f9090209e659e60422634c8bbcf (diff) | |
Merge branch '2023-07-17-assorted-updates'
- Merge in some Kconfig dependencies fixes, typo fixes, erofs update,
shell portability fix, an env save fix, better mbr+gpt support, and
some android A/B enhancements.
Diffstat (limited to 'include')
| -rw-r--r-- | include/android_ab.h | 3 | ||||
| -rw-r--r-- | include/bootstd.h | 2 | ||||
| -rw-r--r-- | include/part.h | 19 |
3 files changed, 21 insertions, 3 deletions
diff --git a/include/android_ab.h b/include/android_ab.h index 3eb61125c6..1fee7582b9 100644 --- a/include/android_ab.h +++ b/include/android_ab.h @@ -30,6 +30,7 @@ struct disk_partition; * @param[in] part_info Place to store the partition information * Return: The slot number (>= 0) on success, or a negative on error */ -int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info); +int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, + bool dec_tries); #endif /* __ANDROID_AB_H */ diff --git a/include/bootstd.h b/include/bootstd.h index dddb3e1538..7802564bcc 100644 --- a/include/bootstd.h +++ b/include/bootstd.h @@ -69,7 +69,7 @@ const char *const *const bootstd_get_bootdev_order(struct udevice *dev, /** * bootstd_get_prefixes() - Get the filename-prefixes list * - * This reads the prefixes, e.g. {"/", "/bpot", NULL} + * This reads the prefixes, e.g. {"/", "/boot", NULL} * * The list is alloced by the bootstd driver so should not be freed. That is the * reason for all the const stuff in the function signature diff --git a/include/part.h b/include/part.h index 3b1b539869..b19b33ab89 100644 --- a/include/part.h +++ b/include/part.h @@ -105,7 +105,24 @@ struct blk_desc *blk_get_dev(const char *ifname, int dev); struct blk_desc *mg_disk_get_dev(int dev); -/* disk/part.c */ +/** + * part_get_info_by_type() - Get partitions from a block device using a specific + * partition driver + * + * Each interface allocates its own devices and typically struct blk_desc is + * contained with the interface's data structure. There is no global + * numbering for block devices, so the interface name must be provided. + * + * @dev_desc: Block device descriptor + * @part: Partition number to read + * @part_type: Partition driver to use, or PART_TYPE_UNKNOWN to automatically + * choose a driver + * @info: Returned partition information + * + * Return: 0 on success, negative errno on failure + */ +int part_get_info_by_type(struct blk_desc *dev_desc, int part, int part_type, + struct disk_partition *info); int part_get_info(struct blk_desc *dev_desc, int part, struct disk_partition *info); /** |