2002-08-17 09:36:01 +00:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2001
|
|
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
|
|
*
|
|
|
|
* See file CREDITS for list of people who contributed to this
|
|
|
|
* project.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
|
|
* MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <ide.h>
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
#include <malloc.h>
|
2007-02-20 08:04:34 +00:00
|
|
|
#include <part.h>
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
#undef PART_DEBUG
|
|
|
|
|
|
|
|
#ifdef PART_DEBUG
|
|
|
|
#define PRINTF(fmt,args...) printf (fmt ,##args)
|
|
|
|
#else
|
|
|
|
#define PRINTF(fmt,args...)
|
|
|
|
#endif
|
|
|
|
|
2007-02-20 08:04:34 +00:00
|
|
|
struct block_drvr {
|
|
|
|
char *name;
|
|
|
|
block_dev_desc_t* (*get_dev)(int dev);
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct block_drvr block_drvr[] = {
|
2007-07-09 22:22:37 +00:00
|
|
|
#if defined(CONFIG_CMD_IDE)
|
2007-02-20 08:04:34 +00:00
|
|
|
{ .name = "ide", .get_dev = ide_get_dev, },
|
|
|
|
#endif
|
2008-03-26 14:49:44 +00:00
|
|
|
#if defined(CONFIG_CMD_SATA)
|
|
|
|
{.name = "sata", .get_dev = sata_get_dev, },
|
|
|
|
#endif
|
2007-07-09 22:22:37 +00:00
|
|
|
#if defined(CONFIG_CMD_SCSI)
|
2007-02-20 08:04:34 +00:00
|
|
|
{ .name = "scsi", .get_dev = scsi_get_dev, },
|
|
|
|
#endif
|
2007-07-09 22:22:37 +00:00
|
|
|
#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
|
2007-02-20 08:04:34 +00:00
|
|
|
{ .name = "usb", .get_dev = usb_stor_get_dev, },
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_MMC)
|
|
|
|
{ .name = "mmc", .get_dev = mmc_get_dev, },
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYSTEMACE)
|
|
|
|
{ .name = "ace", .get_dev = systemace_get_dev, },
|
|
|
|
#endif
|
|
|
|
{ },
|
|
|
|
};
|
|
|
|
|
2007-02-20 12:21:57 +00:00
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
2012-10-12 14:26:08 +00:00
|
|
|
#ifdef HAVE_BLOCK_DEVICE
|
2012-09-21 04:08:17 +00:00
|
|
|
block_dev_desc_t *get_dev(const char *ifname, int dev)
|
2007-02-20 08:04:34 +00:00
|
|
|
{
|
|
|
|
const struct block_drvr *drvr = block_drvr;
|
2007-02-22 06:43:34 +00:00
|
|
|
block_dev_desc_t* (*reloc_get_dev)(int dev);
|
2010-09-17 11:10:36 +00:00
|
|
|
char *name;
|
2007-02-20 08:04:34 +00:00
|
|
|
|
2012-03-27 09:43:25 +00:00
|
|
|
if (!ifname)
|
|
|
|
return NULL;
|
|
|
|
|
2010-09-17 11:10:36 +00:00
|
|
|
name = drvr->name;
|
2010-10-28 18:00:11 +00:00
|
|
|
#ifdef CONFIG_NEEDS_MANUAL_RELOC
|
2010-09-17 11:10:36 +00:00
|
|
|
name += gd->reloc_off;
|
|
|
|
#endif
|
2011-02-15 08:56:40 +00:00
|
|
|
while (drvr->name) {
|
2010-09-17 11:10:36 +00:00
|
|
|
name = drvr->name;
|
2009-09-21 16:20:36 +00:00
|
|
|
reloc_get_dev = drvr->get_dev;
|
2010-10-28 18:00:11 +00:00
|
|
|
#ifdef CONFIG_NEEDS_MANUAL_RELOC
|
2010-09-17 11:10:36 +00:00
|
|
|
name += gd->reloc_off;
|
2009-09-21 16:20:36 +00:00
|
|
|
reloc_get_dev += gd->reloc_off;
|
|
|
|
#endif
|
2010-09-17 11:10:36 +00:00
|
|
|
if (strncmp(ifname, name, strlen(name)) == 0)
|
2007-02-20 12:21:57 +00:00
|
|
|
return reloc_get_dev(dev);
|
2007-02-20 08:04:34 +00:00
|
|
|
drvr++;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#else
|
2012-09-21 04:08:17 +00:00
|
|
|
block_dev_desc_t *get_dev(const char *ifname, int dev)
|
2007-02-20 08:04:34 +00:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-10-12 14:26:08 +00:00
|
|
|
#ifdef HAVE_BLOCK_DEVICE
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/*
|
|
|
|
* reports device info to the user
|
|
|
|
*/
|
2010-08-08 12:05:39 +00:00
|
|
|
|
2004-03-14 22:25:36 +00:00
|
|
|
#ifdef CONFIG_LBA48
|
2010-08-08 12:05:39 +00:00
|
|
|
typedef uint64_t lba512_t;
|
2004-03-13 23:29:43 +00:00
|
|
|
#else
|
2010-08-08 12:05:39 +00:00
|
|
|
typedef lbaint_t lba512_t;
|
2004-03-13 23:29:43 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2010-08-08 12:05:39 +00:00
|
|
|
/*
|
|
|
|
* Overflowless variant of (block_count * mul_by / div_by)
|
|
|
|
* when div_by > mul_by
|
|
|
|
*/
|
|
|
|
static lba512_t lba512_muldiv (lba512_t block_count, lba512_t mul_by, lba512_t div_by)
|
|
|
|
{
|
|
|
|
lba512_t bc_quot, bc_rem;
|
|
|
|
|
|
|
|
/* x * m / d == x / d * m + (x % d) * m / d */
|
|
|
|
bc_quot = block_count / div_by;
|
|
|
|
bc_rem = block_count - div_by * bc_quot;
|
|
|
|
return bc_quot * mul_by + (bc_rem * mul_by) / div_by;
|
|
|
|
}
|
|
|
|
|
|
|
|
void dev_print (block_dev_desc_t *dev_desc)
|
|
|
|
{
|
|
|
|
lba512_t lba512; /* number of blocks if 512bytes block size */
|
|
|
|
|
2009-05-15 07:27:58 +00:00
|
|
|
if (dev_desc->type == DEV_TYPE_UNKNOWN) {
|
|
|
|
puts ("not available\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-05-29 09:10:30 +00:00
|
|
|
switch (dev_desc->if_type) {
|
2008-05-05 14:11:21 +00:00
|
|
|
case IF_TYPE_SCSI:
|
|
|
|
printf ("(%d:%d) Vendor: %s Prod.: %s Rev: %s\n",
|
|
|
|
dev_desc->target,dev_desc->lun,
|
2002-08-17 09:36:01 +00:00
|
|
|
dev_desc->vendor,
|
2008-05-05 14:11:21 +00:00
|
|
|
dev_desc->product,
|
|
|
|
dev_desc->revision);
|
|
|
|
break;
|
2008-09-19 11:30:06 +00:00
|
|
|
case IF_TYPE_ATAPI:
|
2008-05-05 14:11:21 +00:00
|
|
|
case IF_TYPE_IDE:
|
|
|
|
case IF_TYPE_SATA:
|
2008-03-26 14:49:44 +00:00
|
|
|
printf ("Model: %s Firm: %s Ser#: %s\n",
|
|
|
|
dev_desc->vendor,
|
|
|
|
dev_desc->revision,
|
|
|
|
dev_desc->product);
|
2008-05-05 14:11:21 +00:00
|
|
|
break;
|
2008-09-19 11:30:06 +00:00
|
|
|
case IF_TYPE_SD:
|
|
|
|
case IF_TYPE_MMC:
|
2008-09-04 18:35:46 +00:00
|
|
|
case IF_TYPE_USB:
|
|
|
|
printf ("Vendor: %s Rev: %s Prod: %s\n",
|
|
|
|
dev_desc->vendor,
|
|
|
|
dev_desc->revision,
|
|
|
|
dev_desc->product);
|
|
|
|
break;
|
2008-09-19 11:30:06 +00:00
|
|
|
case IF_TYPE_DOC:
|
|
|
|
puts("device type DOC\n");
|
|
|
|
return;
|
2008-05-29 09:10:30 +00:00
|
|
|
case IF_TYPE_UNKNOWN:
|
2008-09-19 11:30:06 +00:00
|
|
|
puts("device type unknown\n");
|
|
|
|
return;
|
2008-05-05 14:11:21 +00:00
|
|
|
default:
|
2008-09-19 11:30:06 +00:00
|
|
|
printf("Unhandled device type: %i\n", dev_desc->if_type);
|
2008-05-05 14:11:21 +00:00
|
|
|
return;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
puts (" Type: ");
|
|
|
|
if (dev_desc->removable)
|
|
|
|
puts ("Removable ");
|
|
|
|
switch (dev_desc->type & 0x1F) {
|
2008-05-05 14:11:22 +00:00
|
|
|
case DEV_TYPE_HARDDISK:
|
|
|
|
puts ("Hard Disk");
|
|
|
|
break;
|
|
|
|
case DEV_TYPE_CDROM:
|
|
|
|
puts ("CD ROM");
|
|
|
|
break;
|
|
|
|
case DEV_TYPE_OPDISK:
|
|
|
|
puts ("Optical Device");
|
|
|
|
break;
|
|
|
|
case DEV_TYPE_TAPE:
|
|
|
|
puts ("Tape");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printf ("# %02X #", dev_desc->type & 0x1F);
|
|
|
|
break;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
puts ("\n");
|
2012-11-06 15:33:12 +00:00
|
|
|
if (dev_desc->lba > 0L && dev_desc->blksz > 0L) {
|
2002-08-17 09:36:01 +00:00
|
|
|
ulong mb, mb_quot, mb_rem, gb, gb_quot, gb_rem;
|
2004-03-13 23:29:43 +00:00
|
|
|
lbaint_t lba;
|
2004-04-18 17:39:38 +00:00
|
|
|
|
|
|
|
lba = dev_desc->lba;
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2004-03-13 23:29:43 +00:00
|
|
|
lba512 = (lba * (dev_desc->blksz/512));
|
2002-08-17 09:36:01 +00:00
|
|
|
/* round to 1 digit */
|
2010-08-08 12:05:39 +00:00
|
|
|
mb = lba512_muldiv(lba512, 10, 2048); /* 2048 = (1024 * 1024) / 512 MB */
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
mb_quot = mb / 10;
|
|
|
|
mb_rem = mb - (10 * mb_quot);
|
|
|
|
|
|
|
|
gb = mb / 1024;
|
|
|
|
gb_quot = gb / 10;
|
|
|
|
gb_rem = gb - (10 * gb_quot);
|
2004-03-14 22:25:36 +00:00
|
|
|
#ifdef CONFIG_LBA48
|
2004-04-18 17:39:38 +00:00
|
|
|
if (dev_desc->lba48)
|
2004-03-13 23:29:43 +00:00
|
|
|
printf (" Supports 48-bit addressing\n");
|
|
|
|
#endif
|
2009-12-03 10:21:21 +00:00
|
|
|
#if defined(CONFIG_SYS_64BIT_LBA)
|
2009-02-17 04:21:36 +00:00
|
|
|
printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n",
|
2004-03-13 23:29:43 +00:00
|
|
|
mb_quot, mb_rem,
|
|
|
|
gb_quot, gb_rem,
|
|
|
|
lba,
|
|
|
|
dev_desc->blksz);
|
|
|
|
#else
|
2002-08-17 09:36:01 +00:00
|
|
|
printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n",
|
|
|
|
mb_quot, mb_rem,
|
|
|
|
gb_quot, gb_rem,
|
2004-03-13 23:29:43 +00:00
|
|
|
(ulong)lba,
|
2002-08-17 09:36:01 +00:00
|
|
|
dev_desc->blksz);
|
2004-03-13 23:29:43 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
} else {
|
|
|
|
puts (" Capacity: not available\n");
|
|
|
|
}
|
|
|
|
}
|
2007-07-10 16:19:50 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2012-10-12 14:26:08 +00:00
|
|
|
#ifdef HAVE_BLOCK_DEVICE
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
void init_part (block_dev_desc_t * dev_desc)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_ISO_PARTITION
|
|
|
|
if (test_part_iso(dev_desc) == 0) {
|
|
|
|
dev_desc->part_type = PART_TYPE_ISO;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_MAC_PARTITION
|
|
|
|
if (test_part_mac(dev_desc) == 0) {
|
|
|
|
dev_desc->part_type = PART_TYPE_MAC;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-09-26 15:13:22 +00:00
|
|
|
/* must be placed before DOS partition detection */
|
|
|
|
#ifdef CONFIG_EFI_PARTITION
|
|
|
|
if (test_part_efi(dev_desc) == 0) {
|
|
|
|
dev_desc->part_type = PART_TYPE_EFI;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
#ifdef CONFIG_DOS_PARTITION
|
|
|
|
if (test_part_dos(dev_desc) == 0) {
|
|
|
|
dev_desc->part_type = PART_TYPE_DOS;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2002-11-19 11:04:11 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_AMIGA_PARTITION
|
|
|
|
if (test_part_amiga(dev_desc) == 0) {
|
|
|
|
dev_desc->part_type = PART_TYPE_AMIGA;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2012-09-21 04:08:17 +00:00
|
|
|
dev_desc->part_type = PART_TYPE_UNKNOWN;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-10-12 14:26:08 +00:00
|
|
|
#if defined(CONFIG_MAC_PARTITION) || \
|
|
|
|
defined(CONFIG_DOS_PARTITION) || \
|
|
|
|
defined(CONFIG_ISO_PARTITION) || \
|
|
|
|
defined(CONFIG_AMIGA_PARTITION) || \
|
|
|
|
defined(CONFIG_EFI_PARTITION)
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
|
|
|
|
{
|
|
|
|
puts ("\nPartition Map for ");
|
|
|
|
switch (dev_desc->if_type) {
|
2008-05-05 14:11:22 +00:00
|
|
|
case IF_TYPE_IDE:
|
|
|
|
puts ("IDE");
|
|
|
|
break;
|
|
|
|
case IF_TYPE_SATA:
|
|
|
|
puts ("SATA");
|
|
|
|
break;
|
|
|
|
case IF_TYPE_SCSI:
|
|
|
|
puts ("SCSI");
|
|
|
|
break;
|
|
|
|
case IF_TYPE_ATAPI:
|
|
|
|
puts ("ATAPI");
|
|
|
|
break;
|
|
|
|
case IF_TYPE_USB:
|
|
|
|
puts ("USB");
|
|
|
|
break;
|
|
|
|
case IF_TYPE_DOC:
|
|
|
|
puts ("DOC");
|
|
|
|
break;
|
2010-09-13 14:07:28 +00:00
|
|
|
case IF_TYPE_MMC:
|
|
|
|
puts ("MMC");
|
|
|
|
break;
|
2008-05-05 14:11:22 +00:00
|
|
|
default:
|
|
|
|
puts ("UNKNOWN");
|
|
|
|
break;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
printf (" device %d -- Partition Type: %s\n\n",
|
|
|
|
dev_desc->dev, type);
|
|
|
|
}
|
|
|
|
|
2012-10-12 14:26:08 +00:00
|
|
|
#endif /* any CONFIG_..._PARTITION */
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
void print_part (block_dev_desc_t * dev_desc)
|
|
|
|
{
|
|
|
|
|
|
|
|
switch (dev_desc->part_type) {
|
|
|
|
#ifdef CONFIG_MAC_PARTITION
|
|
|
|
case PART_TYPE_MAC:
|
|
|
|
PRINTF ("## Testing for valid MAC partition ##\n");
|
|
|
|
print_part_header ("MAC", dev_desc);
|
|
|
|
print_part_mac (dev_desc);
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_DOS_PARTITION
|
|
|
|
case PART_TYPE_DOS:
|
|
|
|
PRINTF ("## Testing for valid DOS partition ##\n");
|
|
|
|
print_part_header ("DOS", dev_desc);
|
|
|
|
print_part_dos (dev_desc);
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_ISO_PARTITION
|
|
|
|
case PART_TYPE_ISO:
|
|
|
|
PRINTF ("## Testing for valid ISO Boot partition ##\n");
|
|
|
|
print_part_header ("ISO", dev_desc);
|
|
|
|
print_part_iso (dev_desc);
|
|
|
|
return;
|
|
|
|
#endif
|
2002-11-19 11:04:11 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_AMIGA_PARTITION
|
|
|
|
case PART_TYPE_AMIGA:
|
|
|
|
PRINTF ("## Testing for a valid Amiga partition ##\n");
|
|
|
|
print_part_header ("AMIGA", dev_desc);
|
|
|
|
print_part_amiga (dev_desc);
|
|
|
|
return;
|
|
|
|
#endif
|
2008-09-26 15:13:22 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_EFI_PARTITION
|
|
|
|
case PART_TYPE_EFI:
|
|
|
|
PRINTF ("## Testing for valid EFI partition ##\n");
|
|
|
|
print_part_header ("EFI", dev_desc);
|
|
|
|
print_part_efi (dev_desc);
|
|
|
|
return;
|
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
puts ("## Unknown partition table\n");
|
|
|
|
}
|
|
|
|
|
2012-10-12 14:26:08 +00:00
|
|
|
#endif /* HAVE_BLOCK_DEVICE */
|
disk: make get_partition_info() always available to disk.c
Now that get_device_and_partition() always calls get_partition_info()
when disk.c is compiled, we must always compile the function, rather
than ifdef it away.
The implementation must be conditional based on CONFIG_CMD_* etc., since
that's what e.g. part_dos.c uses to ifdef out get_partition_info_dos();
CONFIG_DOS_PARTITION can be enabled even without those commands being
enabled.
Technically, this change is required before Rob's "disk/part: introduce
get_device_and_partition" patch. However, at least when the compiler
optimizer is turned on, it isn't required before then in practice,
since get_device_and_partition() calls get_dev(), which is stubbed out
in disk.c under exactly the same conditions that get_partition_info()
is not compiled, and hence the compiler never generates code for the
call to the missing function. However, in my later patch "disk:
get_device_and_partition() "auto" partition and cleanup", the optimizer
doesn't succeed at this, and may attempt to reference the undefined
function.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-09-21 12:46:54 +00:00
|
|
|
|
|
|
|
int get_partition_info(block_dev_desc_t *dev_desc, int part
|
|
|
|
, disk_partition_t *info)
|
|
|
|
{
|
2012-10-12 14:26:08 +00:00
|
|
|
#ifdef HAVE_BLOCK_DEVICE
|
disk: make get_partition_info() always available to disk.c
Now that get_device_and_partition() always calls get_partition_info()
when disk.c is compiled, we must always compile the function, rather
than ifdef it away.
The implementation must be conditional based on CONFIG_CMD_* etc., since
that's what e.g. part_dos.c uses to ifdef out get_partition_info_dos();
CONFIG_DOS_PARTITION can be enabled even without those commands being
enabled.
Technically, this change is required before Rob's "disk/part: introduce
get_device_and_partition" patch. However, at least when the compiler
optimizer is turned on, it isn't required before then in practice,
since get_device_and_partition() calls get_dev(), which is stubbed out
in disk.c under exactly the same conditions that get_partition_info()
is not compiled, and hence the compiler never generates code for the
call to the missing function. However, in my later patch "disk:
get_device_and_partition() "auto" partition and cleanup", the optimizer
doesn't succeed at this, and may attempt to reference the undefined
function.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-09-21 12:46:54 +00:00
|
|
|
|
2012-09-21 09:50:59 +00:00
|
|
|
#ifdef CONFIG_PARTITION_UUIDS
|
|
|
|
/* The common case is no UUID support */
|
|
|
|
info->uuid[0] = 0;
|
|
|
|
#endif
|
|
|
|
|
disk: make get_partition_info() always available to disk.c
Now that get_device_and_partition() always calls get_partition_info()
when disk.c is compiled, we must always compile the function, rather
than ifdef it away.
The implementation must be conditional based on CONFIG_CMD_* etc., since
that's what e.g. part_dos.c uses to ifdef out get_partition_info_dos();
CONFIG_DOS_PARTITION can be enabled even without those commands being
enabled.
Technically, this change is required before Rob's "disk/part: introduce
get_device_and_partition" patch. However, at least when the compiler
optimizer is turned on, it isn't required before then in practice,
since get_device_and_partition() calls get_dev(), which is stubbed out
in disk.c under exactly the same conditions that get_partition_info()
is not compiled, and hence the compiler never generates code for the
call to the missing function. However, in my later patch "disk:
get_device_and_partition() "auto" partition and cleanup", the optimizer
doesn't succeed at this, and may attempt to reference the undefined
function.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-09-21 12:46:54 +00:00
|
|
|
switch (dev_desc->part_type) {
|
|
|
|
#ifdef CONFIG_MAC_PARTITION
|
|
|
|
case PART_TYPE_MAC:
|
|
|
|
if (get_partition_info_mac(dev_desc, part, info) == 0) {
|
|
|
|
PRINTF("## Valid MAC partition found ##\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_DOS_PARTITION
|
|
|
|
case PART_TYPE_DOS:
|
|
|
|
if (get_partition_info_dos(dev_desc, part, info) == 0) {
|
|
|
|
PRINTF("## Valid DOS partition found ##\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_ISO_PARTITION
|
|
|
|
case PART_TYPE_ISO:
|
|
|
|
if (get_partition_info_iso(dev_desc, part, info) == 0) {
|
|
|
|
PRINTF("## Valid ISO boot partition found ##\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_AMIGA_PARTITION
|
|
|
|
case PART_TYPE_AMIGA:
|
|
|
|
if (get_partition_info_amiga(dev_desc, part, info) == 0) {
|
|
|
|
PRINTF("## Valid Amiga partition found ##\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_EFI_PARTITION
|
|
|
|
case PART_TYPE_EFI:
|
|
|
|
if (get_partition_info_efi(dev_desc, part, info) == 0) {
|
|
|
|
PRINTF("## Valid EFI partition found ##\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2012-10-12 14:26:08 +00:00
|
|
|
#endif /* HAVE_BLOCK_DEVICE */
|
disk: make get_partition_info() always available to disk.c
Now that get_device_and_partition() always calls get_partition_info()
when disk.c is compiled, we must always compile the function, rather
than ifdef it away.
The implementation must be conditional based on CONFIG_CMD_* etc., since
that's what e.g. part_dos.c uses to ifdef out get_partition_info_dos();
CONFIG_DOS_PARTITION can be enabled even without those commands being
enabled.
Technically, this change is required before Rob's "disk/part: introduce
get_device_and_partition" patch. However, at least when the compiler
optimizer is turned on, it isn't required before then in practice,
since get_device_and_partition() calls get_dev(), which is stubbed out
in disk.c under exactly the same conditions that get_partition_info()
is not compiled, and hence the compiler never generates code for the
call to the missing function. However, in my later patch "disk:
get_device_and_partition() "auto" partition and cleanup", the optimizer
doesn't succeed at this, and may attempt to reference the undefined
function.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2012-09-21 12:46:54 +00:00
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
2012-09-21 04:08:17 +00:00
|
|
|
|
2012-09-21 09:50:56 +00:00
|
|
|
int get_device(const char *ifname, const char *dev_str,
|
|
|
|
block_dev_desc_t **dev_desc)
|
|
|
|
{
|
|
|
|
char *ep;
|
|
|
|
int dev;
|
|
|
|
|
|
|
|
dev = simple_strtoul(dev_str, &ep, 16);
|
|
|
|
if (*ep) {
|
|
|
|
printf("** Bad device specification %s %s **\n",
|
|
|
|
ifname, dev_str);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
*dev_desc = get_dev(ifname, dev);
|
|
|
|
if (!(*dev_desc) || ((*dev_desc)->type == DEV_TYPE_UNKNOWN)) {
|
|
|
|
printf("** Bad device %s %s **\n", ifname, dev_str);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dev;
|
|
|
|
}
|
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
#define PART_UNSPECIFIED -2
|
|
|
|
#define PART_AUTO -1
|
|
|
|
#define MAX_SEARCH_PARTITIONS 16
|
|
|
|
int get_device_and_partition(const char *ifname, const char *dev_part_str,
|
2012-09-21 04:08:17 +00:00
|
|
|
block_dev_desc_t **dev_desc,
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
disk_partition_t *info, int allow_whole_dev)
|
2012-09-21 04:08:17 +00:00
|
|
|
{
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
int ret = -1;
|
|
|
|
const char *part_str;
|
|
|
|
char *dup_str = NULL;
|
|
|
|
const char *dev_str;
|
2012-09-21 04:08:17 +00:00
|
|
|
int dev;
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
char *ep;
|
|
|
|
int p;
|
|
|
|
int part;
|
|
|
|
disk_partition_t tmpinfo;
|
|
|
|
|
2012-12-26 09:53:35 +00:00
|
|
|
/*
|
|
|
|
* For now, we have a special case for sandbox, since there is no
|
|
|
|
* real block device support.
|
|
|
|
*/
|
|
|
|
if (0 == strcmp(ifname, "host")) {
|
|
|
|
*dev_desc = NULL;
|
|
|
|
info->start = info->size = info->blksz = 0;
|
|
|
|
info->bootable = 0;
|
|
|
|
strcpy((char *)info->type, BOOT_PART_TYPE);
|
|
|
|
strcpy((char *)info->name, "Sandbox host");
|
|
|
|
#ifdef CONFIG_PARTITION_UUIDS
|
|
|
|
info->uuid[0] = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
/* If no dev_part_str, use bootdevice environment variable */
|
2012-09-28 05:34:09 +00:00
|
|
|
if (!dev_part_str || !strlen(dev_part_str) ||
|
|
|
|
!strcmp(dev_part_str, "-"))
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
dev_part_str = getenv("bootdevice");
|
|
|
|
|
|
|
|
/* If still no dev_part_str, it's an error */
|
|
|
|
if (!dev_part_str) {
|
|
|
|
printf("** No device specified **\n");
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Separate device and partition ID specification */
|
|
|
|
part_str = strchr(dev_part_str, ':');
|
|
|
|
if (part_str) {
|
|
|
|
dup_str = strdup(dev_part_str);
|
|
|
|
dup_str[part_str - dev_part_str] = 0;
|
|
|
|
dev_str = dup_str;
|
|
|
|
part_str++;
|
|
|
|
} else {
|
|
|
|
dev_str = dev_part_str;
|
2012-09-21 04:08:17 +00:00
|
|
|
}
|
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
/* Look up the device */
|
|
|
|
dev = get_device(ifname, dev_str, dev_desc);
|
|
|
|
if (dev < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
/* Convert partition ID string to number */
|
|
|
|
if (!part_str || !*part_str) {
|
|
|
|
part = PART_UNSPECIFIED;
|
|
|
|
} else if (!strcmp(part_str, "auto")) {
|
|
|
|
part = PART_AUTO;
|
|
|
|
} else {
|
|
|
|
/* Something specified -> use exactly that */
|
|
|
|
part = (int)simple_strtoul(part_str, &ep, 16);
|
|
|
|
/*
|
|
|
|
* Less than whole string converted,
|
|
|
|
* or request for whole device, but caller requires partition.
|
|
|
|
*/
|
|
|
|
if (*ep || (part == 0 && !allow_whole_dev)) {
|
|
|
|
printf("** Bad partition specification %s %s **\n",
|
|
|
|
ifname, dev_part_str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No partition table on device,
|
|
|
|
* or user requested partition 0 (entire device).
|
|
|
|
*/
|
|
|
|
if (((*dev_desc)->part_type == PART_TYPE_UNKNOWN) ||
|
|
|
|
(part == 0)) {
|
|
|
|
if (!(*dev_desc)->lba) {
|
|
|
|
printf("** Bad device size - %s %s **\n", ifname,
|
|
|
|
dev_str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2012-09-21 04:08:17 +00:00
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
/*
|
|
|
|
* If user specified a partition ID other than 0,
|
|
|
|
* or the calling command only accepts partitions,
|
|
|
|
* it's an error.
|
|
|
|
*/
|
|
|
|
if ((part > 0) || (!allow_whole_dev)) {
|
|
|
|
printf("** No partition table - %s %s **\n", ifname,
|
|
|
|
dev_str);
|
|
|
|
goto cleanup;
|
2012-09-21 04:08:17 +00:00
|
|
|
}
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
|
2012-09-21 04:08:17 +00:00
|
|
|
info->start = 0;
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
info->size = (*dev_desc)->lba;
|
|
|
|
info->blksz = (*dev_desc)->blksz;
|
|
|
|
info->bootable = 0;
|
2012-10-10 07:57:51 +00:00
|
|
|
strcpy((char *)info->type, BOOT_PART_TYPE);
|
|
|
|
strcpy((char *)info->name, "Whole Disk");
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
#ifdef CONFIG_PARTITION_UUIDS
|
|
|
|
info->uuid[0] = 0;
|
|
|
|
#endif
|
2012-09-21 04:08:17 +00:00
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
ret = 0;
|
|
|
|
goto cleanup;
|
2012-09-21 04:08:17 +00:00
|
|
|
}
|
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
/*
|
|
|
|
* Now there's known to be a partition table,
|
|
|
|
* not specifying a partition means to pick partition 1.
|
|
|
|
*/
|
|
|
|
if (part == PART_UNSPECIFIED)
|
|
|
|
part = 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If user didn't specify a partition number, or did specify something
|
|
|
|
* other than "auto", use that partition number directly.
|
|
|
|
*/
|
|
|
|
if (part != PART_AUTO) {
|
|
|
|
ret = get_partition_info(*dev_desc, part, info);
|
|
|
|
if (ret) {
|
|
|
|
printf("** Invalid partition %d **\n", part);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Find the first bootable partition.
|
|
|
|
* If none are bootable, fall back to the first valid partition.
|
|
|
|
*/
|
|
|
|
part = 0;
|
|
|
|
for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) {
|
|
|
|
ret = get_partition_info(*dev_desc, p, info);
|
|
|
|
if (ret)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First valid partition, or new better partition?
|
|
|
|
* If so, save partition ID.
|
|
|
|
*/
|
|
|
|
if (!part || info->bootable)
|
|
|
|
part = p;
|
|
|
|
|
|
|
|
/* Best possible partition? Stop searching. */
|
|
|
|
if (info->bootable)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We now need to search further for best possible.
|
|
|
|
* If we what we just queried was the best so far,
|
|
|
|
* save the info since we over-write it next loop.
|
|
|
|
*/
|
|
|
|
if (part == p)
|
|
|
|
tmpinfo = *info;
|
|
|
|
}
|
|
|
|
/* If we found any acceptable partition */
|
|
|
|
if (part) {
|
|
|
|
/*
|
|
|
|
* If we searched all possible partition IDs,
|
|
|
|
* return the first valid partition we found.
|
|
|
|
*/
|
|
|
|
if (p == MAX_SEARCH_PARTITIONS + 1)
|
|
|
|
*info = tmpinfo;
|
|
|
|
} else {
|
|
|
|
printf("** No valid partitions found **\n");
|
2012-10-08 07:45:54 +00:00
|
|
|
ret = -1;
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2012-09-21 04:08:17 +00:00
|
|
|
}
|
|
|
|
if (strncmp((char *)info->type, BOOT_PART_TYPE, sizeof(info->type)) != 0) {
|
|
|
|
printf("** Invalid partition type \"%.32s\""
|
|
|
|
" (expect \"" BOOT_PART_TYPE "\")\n",
|
|
|
|
info->type);
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
ret = -1;
|
|
|
|
goto cleanup;
|
2012-09-21 04:08:17 +00:00
|
|
|
}
|
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
ret = part;
|
|
|
|
goto cleanup;
|
2012-09-21 04:08:17 +00:00
|
|
|
|
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>
2012-09-21 09:50:57 +00:00
|
|
|
cleanup:
|
|
|
|
free(dup_str);
|
|
|
|
return ret;
|
2012-09-21 04:08:17 +00:00
|
|
|
}
|