diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-26 15:11:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-26 15:11:08 -0500 |
| commit | 08cca188c120b8337600091c94dc0e211cd03e10 (patch) | |
| tree | bb6980e98ba2b14919b38619994ffa6f65d839b5 /include | |
| parent | b839fc9d47bbfc4ab4f0817a03e0e0e25b93e925 (diff) | |
| parent | 0a7e5e5f103867789328067f87e34b25b26fc3b0 (diff) | |
| download | u-boot-08cca188c120b8337600091c94dc0e211cd03e10.tar.gz u-boot-08cca188c120b8337600091c94dc0e211cd03e10.tar.xz u-boot-08cca188c120b8337600091c94dc0e211cd03e10.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-usb
- fastboot updates / fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/fastboot.h | 7 | ||||
| -rw-r--r-- | include/part.h | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/fastboot.h b/include/fastboot.h index 797d7dfd52..57daaf1298 100644 --- a/include/fastboot.h +++ b/include/fastboot.h @@ -44,6 +44,10 @@ enum { #if CONFIG_IS_ENABLED(FASTBOOT_CMD_OEM_BOOTBUS) FASTBOOT_COMMAND_OEM_BOOTBUS, #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) + FASTBOOT_COMMAND_ACMD, + FASTBOOT_COMMAND_UCMD, +#endif FASTBOOT_COMMAND_COUNT }; @@ -169,4 +173,7 @@ void fastboot_data_download(const void *fastboot_data, */ void fastboot_data_complete(char *response); +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) +void fastboot_acmd_complete(void); +#endif #endif /* _FASTBOOT_H_ */ diff --git a/include/part.h b/include/part.h index 815515aa80..7f78271a98 100644 --- a/include/part.h +++ b/include/part.h @@ -227,12 +227,16 @@ int part_get_info_by_name(struct blk_desc *dev_desc, * @param[in] dev_part_str Input partition description, like "0#misc" or "0:1" * @param[out] dev_desc Place to store the device description pointer * @param[out] part_info Place to store the partition information + * @param[in] allow_whole_dev true to allow the user to select partition 0 + * (which means the whole device), false to require a valid + * partition number >= 1 * @return 0 on success, or a negative on error */ int part_get_info_by_dev_and_name_or_num(const char *dev_iface, const char *dev_part_str, struct blk_desc **dev_desc, - struct disk_partition *part_info); + struct disk_partition *part_info, + int allow_whole_dev); /** * part_set_generic_name() - create generic partition like hda1 or sdb2 |