diff options
| author | wdenk <wdenk> | 2005-03-04 11:27:31 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-03-04 11:27:31 +0000 |
| commit | b05dcb58fe04c6274fc942fa93efe77072395951 (patch) | |
| tree | 214508184e4332109c02b2a958e9fefeec7a00b4 /common | |
| parent | 47b1e3d77fcd951df45259a4b20cc116d226e10f (diff) | |
| download | u-boot-b05dcb58fe04c6274fc942fa93efe77072395951.tar.gz u-boot-b05dcb58fe04c6274fc942fa93efe77072395951.tar.bz2 u-boot-b05dcb58fe04c6274fc942fa93efe77072395951.zip | |
* Fix get_partition_info() parameter error in all other calls
(common/cmd_ide.c, common/cmd_reiser.c, common/cmd_scsi.c).
* Enable USB and IDE support for INKA4x0 board
* Patch by Andrew Dyer, 28 February 2005:
fix ext2load passing an incorrect pointer to get_partition_info()
resulting in load failure for devices other than 0
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ext2.c | 5 | ||||
| -rw-r--r-- | common/cmd_ide.c | 2 | ||||
| -rw-r--r-- | common/cmd_reiser.c | 2 | ||||
| -rw-r--r-- | common/cmd_scsi.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index 75afb320ec..af836cd614 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -41,6 +41,9 @@ #include <linux/ctype.h> #include <asm/byteorder.h> #include <ext2fs.h> +#if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE)) +#include <usb.h> +#endif #ifndef CONFIG_DOS_PARTITION #error DOS partition support must be selected @@ -223,7 +226,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) PRINTF("Using device %s%d, partition %d\n", argv[1], dev, part); if (part != 0) { - if (get_partition_info (&dev_desc[dev], part, &info)) { + if (get_partition_info (dev_desc, part, &info)) { printf ("** Bad partition %d **\n", part); return(1); } diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 1cc88e3e50..e185c95b26 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -413,7 +413,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } part = simple_strtoul(++ep, NULL, 16); } - if (get_partition_info (&ide_dev_desc[dev], part, &info)) { + if (get_partition_info (ide_dev_desc, part, &info)) { SHOW_BOOT_PROGRESS (-1); return 1; } diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c index cb316e5969..508ffcbdac 100644 --- a/common/cmd_reiser.c +++ b/common/cmd_reiser.c @@ -212,7 +212,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) PRINTF("Using device %s%d, partition %d\n", argv[1], dev, part); if (part != 0) { - if (get_partition_info (&dev_desc[dev], part, &info)) { + if (get_partition_info (dev_desc, part, &info)) { printf ("** Bad partition %d **\n", part); return 1; } diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index 68e46b6389..7ee9d8efb1 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -243,7 +243,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } part = simple_strtoul(++ep, NULL, 16); } - if (get_partition_info (&scsi_dev_desc[dev], part, &info)) { + if (get_partition_info (scsi_dev_desc, part, &info)) { printf("error reading partinfo\n"); return 1; } |