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 /common/cmd_fat.c | |
| parent | 2023e60861283ee808950a558e14b45be8776bf4 (diff) | |
| download | olio-uboot-2014.01-10a37fd7a40826c43a63591855346adf1a1ac02d.tar.xz olio-uboot-2014.01-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 'common/cmd_fat.c')
| -rw-r--r-- | common/cmd_fat.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/common/cmd_fat.c b/common/cmd_fat.c index 90412d623..01e02f5b2 100644 --- a/common/cmd_fat.c +++ b/common/cmd_fat.c @@ -49,7 +49,7 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  		return 1;  	} -	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info); +	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);  	if (part < 0)  		return 1; @@ -101,7 +101,7 @@ int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  		return 0;  	} -	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info); +	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);  	if (part < 0)  		return 1; @@ -139,7 +139,7 @@ int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  		return 0;  	} -	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info); +	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);  	if (part < 0)  		return 1; @@ -175,7 +175,7 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,  	if (argc < 5)  		return cmd_usage(cmdtp); -	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info); +	part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);  	if (part < 0)  		return 1; |