diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-21 09:50:57 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-25 14:58:48 -0700 |
| commit | 10a37fd7a40826c43a63591855346adf1a1ac02d (patch) | |
| tree | bfe36ab5ea3f539433740e271ba6e5215b5a43a1 /include/part.h | |
| parent | 2023e60861283ee808950a558e14b45be8776bf4 (diff) | |
| download | blackbird-obmc-uboot-10a37fd7a40826c43a63591855346adf1a1ac02d.tar.gz blackbird-obmc-uboot-10a37fd7a40826c43a63591855346adf1a1ac02d.zip | |
disk: get_device_and_partition() "auto" partition and cleanup
Rework get_device_and_partition() to:
a) Implement a new partition ID of "auto", which requests that U-Boot
search for the first "bootable" partition, and fall back to the first
valid partition if none is found. This way, users don't need to
specify an explicit partition in their commands.
b) Make use of get_device().
c) Add parameter to indicate whether returning a whole device is
acceptable, or whether a partition is mandatory.
d) Make error-checking of the user's device-/partition-specification
more complete. In particular, if strtoul() doesn't convert all
characters, it's an error rather than just ignored.
The resultant device/partition returned by the function will be as
follows, based on whether the disk has a partition table (ptable) or not,
and whether the calling command allows the whole device to be returned
or not.
(D and P are integers, P >= 1)
D
D:
No ptable:
!allow_whole_dev: error
allow_whole_dev: device D
ptable:
device D partition 1
D:0
!allow_whole_dev: error
allow_whole_dev: device D
D:P
No ptable: error
ptable: device D partition P
D:auto
No ptable:
!allow_whole_dev: error
allow_whole_dev: device D
ptable:
first partition in device D with bootable flag set.
If none, first valid paratition in device D.
Note: In order to review this patch, it's probably easiest to simply
look at the file contents post-application, rather than reading the
patch itself.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
[swarren: Rob implemented scanning for bootable partitions. I fixed a
couple of issues there, switched the syntax to ":auto", added the
error-checking rework, and ":0" syntax for the whole device]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'include/part.h')
| -rw-r--r-- | include/part.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/part.h b/include/part.h index 144df4e70b..3f780a1f92 100644 --- a/include/part.h +++ b/include/part.h @@ -114,9 +114,9 @@ void init_part (block_dev_desc_t *dev_desc); void dev_print(block_dev_desc_t *dev_desc); int get_device(const char *ifname, const char *dev_str, block_dev_desc_t **dev_desc); -int get_device_and_partition(const char *ifname, const char *dev_str, +int get_device_and_partition(const char *ifname, const char *dev_part_str, block_dev_desc_t **dev_desc, - disk_partition_t *info); + disk_partition_t *info, int allow_whole_dev); #else static inline block_dev_desc_t *get_dev(const char *ifname, int dev) { return NULL; } @@ -137,9 +137,10 @@ static inline int get_device(const char *ifname, const char *dev_str, block_dev_desc_t **dev_desc) { return -1; } static inline int get_device_and_partition(const char *ifname, - const char *dev_str, + const char *dev_part_str, block_dev_desc_t **dev_desc, - disk_partition_t *info) + disk_partition_t *info, + int allow_whole_dev) { *dev_desc = NULL; return -1; } #endif |
