2003-06-15 22:40:42 +00:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2002
|
|
|
|
* Richard Jones, rjones@nexus-tech.net
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Boot support
|
|
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <s_record.h>
|
|
|
|
#include <net.h>
|
|
|
|
#include <ata.h>
|
2007-02-20 08:04:34 +00:00
|
|
|
#include <part.h>
|
2003-06-15 22:40:42 +00:00
|
|
|
#include <fat.h>
|
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
|
2010-06-28 20:00:46 +00:00
|
|
|
int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
long size;
|
|
|
|
unsigned long offset;
|
2012-09-18 08:14:56 +00:00
|
|
|
unsigned long count = 0;
|
|
|
|
unsigned long pos = 0;
|
2003-10-06 21:55:32 +00:00
|
|
|
char buf [12];
|
2003-09-10 22:30:53 +00:00
|
|
|
block_dev_desc_t *dev_desc=NULL;
|
2012-08-23 11:31:47 +00:00
|
|
|
disk_partition_t info;
|
|
|
|
int part, dev;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
if (argc < 5) {
|
2012-08-23 11:31:47 +00:00
|
|
|
printf("usage: fatload <interface> [<dev[:part]>] "
|
2012-09-18 08:14:56 +00:00
|
|
|
"<addr> <filename> [bytes [pos]]\n");
|
2004-08-28 21:09:14 +00:00
|
|
|
return 1;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
2010-07-19 09:37:00 +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
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
2012-08-23 11:31:47 +00:00
|
|
|
if (part < 0)
|
2003-09-10 22:30:53 +00:00
|
|
|
return 1;
|
2012-08-23 11:31:47 +00:00
|
|
|
|
|
|
|
dev = dev_desc->dev;
|
2003-09-10 22:30:53 +00:00
|
|
|
if (fat_register_device(dev_desc,part)!=0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("\n** Unable to use %s %d:%d for fatload **\n",
|
|
|
|
argv[1], dev, part);
|
2003-09-10 22:30:53 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
offset = simple_strtoul(argv[3], NULL, 16);
|
2012-09-18 08:14:56 +00:00
|
|
|
if (argc >= 6)
|
2010-07-19 09:37:00 +00:00
|
|
|
count = simple_strtoul(argv[5], NULL, 16);
|
2012-09-18 08:14:56 +00:00
|
|
|
if (argc >= 7)
|
|
|
|
pos = simple_strtoul(argv[6], NULL, 16);
|
|
|
|
size = file_fat_read_at(argv[4], pos, (unsigned char *)offset, count);
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2003-10-06 21:55:32 +00:00
|
|
|
if(size==-1) {
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("\n** Unable to read \"%s\" from %s %d:%d **\n",
|
|
|
|
argv[4], argv[1], dev, part);
|
2004-08-28 21:09:14 +00:00
|
|
|
return 1;
|
2003-10-06 21:55:32 +00:00
|
|
|
}
|
|
|
|
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("\n%ld bytes read\n", size);
|
2004-08-28 21:09:14 +00:00
|
|
|
|
|
|
|
sprintf(buf, "%lX", size);
|
|
|
|
setenv("filesize", buf);
|
|
|
|
|
|
|
|
return 0;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
|
2003-07-01 21:06:45 +00:00
|
|
|
U_BOOT_CMD(
|
2012-09-18 08:14:56 +00:00
|
|
|
fatload, 7, 0, do_fat_fsload,
|
2009-01-28 00:03:12 +00:00
|
|
|
"load binary file from a dos filesystem",
|
2012-09-18 08:14:56 +00:00
|
|
|
"<interface> [<dev[:part]>] <addr> <filename> [bytes [pos]]\n"
|
|
|
|
" - Load binary file 'filename' from 'dev' on 'interface'\n"
|
|
|
|
" to address 'addr' from dos filesystem.\n"
|
|
|
|
" 'pos' gives the file position to start loading from.\n"
|
|
|
|
" If 'pos' is omitted, 0 is used. 'pos' requires 'bytes'.\n"
|
|
|
|
" 'bytes' gives the size to load. If 'bytes' is 0 or omitted,\n"
|
|
|
|
" the load stops on end of file."
|
2003-06-29 21:03:46 +00:00
|
|
|
);
|
|
|
|
|
2010-06-28 20:00:46 +00:00
|
|
|
int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
char *filename = "/";
|
2012-08-23 11:31:47 +00:00
|
|
|
int ret, dev, part;
|
2003-09-10 22:30:53 +00:00
|
|
|
block_dev_desc_t *dev_desc=NULL;
|
2012-08-23 11:31:47 +00:00
|
|
|
disk_partition_t info;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2012-08-23 11:31:47 +00:00
|
|
|
if (argc < 2) {
|
|
|
|
printf("usage: fatls <interface> [<dev[:part]>] [directory]\n");
|
2010-07-19 09:37:00 +00:00
|
|
|
return 0;
|
2003-09-10 22:30:53 +00:00
|
|
|
}
|
2012-08-23 11:31:47 +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
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
2012-08-23 11:31:47 +00:00
|
|
|
if (part < 0)
|
2003-09-10 22:30:53 +00:00
|
|
|
return 1;
|
2012-08-23 11:31:47 +00:00
|
|
|
|
|
|
|
dev = dev_desc->dev;
|
2003-09-10 22:30:53 +00:00
|
|
|
if (fat_register_device(dev_desc,part)!=0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("\n** Unable to use %s %d:%d for fatls **\n",
|
|
|
|
argv[1], dev, part);
|
2003-09-10 22:30:53 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (argc == 4)
|
2010-07-19 09:37:00 +00:00
|
|
|
ret = file_fat_ls(argv[3]);
|
2003-06-15 22:40:42 +00:00
|
|
|
else
|
2010-07-19 09:37:00 +00:00
|
|
|
ret = file_fat_ls(filename);
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
if(ret!=0)
|
|
|
|
printf("No Fat FS detected\n");
|
2010-07-19 09:37:00 +00:00
|
|
|
return ret;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2003-07-01 21:06:45 +00:00
|
|
|
U_BOOT_CMD(
|
2003-09-10 22:30:53 +00:00
|
|
|
fatls, 4, 1, do_fat_ls,
|
2009-01-28 00:03:12 +00:00
|
|
|
"list files in a directory (default /)",
|
2012-08-23 11:31:47 +00:00
|
|
|
"<interface> [<dev[:part]>] [directory]\n"
|
2009-05-24 15:06:54 +00:00
|
|
|
" - list files from 'dev' on 'interface' in a 'directory'"
|
2003-06-29 21:03:46 +00:00
|
|
|
);
|
|
|
|
|
2010-06-28 20:00:46 +00:00
|
|
|
int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2012-08-23 11:31:47 +00:00
|
|
|
int dev, part;
|
|
|
|
block_dev_desc_t *dev_desc;
|
|
|
|
disk_partition_t info;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
if (argc < 2) {
|
2012-08-23 11:31:47 +00:00
|
|
|
printf("usage: fatinfo <interface> [<dev[:part]>]\n");
|
2010-07-19 09:37:00 +00:00
|
|
|
return 0;
|
2003-09-10 22:30:53 +00:00
|
|
|
}
|
2012-08-23 11:31:47 +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
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
2012-08-23 11:31:47 +00:00
|
|
|
if (part < 0)
|
2003-09-10 22:30:53 +00:00
|
|
|
return 1;
|
2012-08-23 11:31:47 +00:00
|
|
|
|
|
|
|
dev = dev_desc->dev;
|
2003-09-10 22:30:53 +00:00
|
|
|
if (fat_register_device(dev_desc,part)!=0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("\n** Unable to use %s %d:%d for fatinfo **\n",
|
|
|
|
argv[1], dev, part);
|
2003-09-10 22:30:53 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
return file_fat_detectfs();
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2003-07-01 21:06:45 +00:00
|
|
|
U_BOOT_CMD(
|
2003-09-10 22:30:53 +00:00
|
|
|
fatinfo, 3, 1, do_fat_fsinfo,
|
2009-01-28 00:03:12 +00:00
|
|
|
"print information about filesystem",
|
2012-08-23 11:31:47 +00:00
|
|
|
"<interface> [<dev[:part]>]\n"
|
2009-05-24 15:06:54 +00:00
|
|
|
" - print information about filesystem from 'dev' on 'interface'"
|
2003-06-29 21:03:46 +00:00
|
|
|
);
|
2012-03-22 04:38:56 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_FAT_WRITE
|
|
|
|
static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
|
|
|
|
int argc, char * const argv[])
|
|
|
|
{
|
|
|
|
long size;
|
|
|
|
unsigned long addr;
|
|
|
|
unsigned long count;
|
|
|
|
block_dev_desc_t *dev_desc = NULL;
|
2012-08-23 11:31:47 +00:00
|
|
|
disk_partition_t info;
|
2012-03-22 04:38:56 +00:00
|
|
|
int dev = 0;
|
|
|
|
int part = 1;
|
|
|
|
|
|
|
|
if (argc < 5)
|
|
|
|
return cmd_usage(cmdtp);
|
|
|
|
|
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
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
2012-08-23 11:31:47 +00:00
|
|
|
if (part < 0)
|
2012-03-22 04:38:56 +00:00
|
|
|
return 1;
|
2012-08-23 11:31:47 +00:00
|
|
|
|
|
|
|
dev = dev_desc->dev;
|
|
|
|
|
2012-03-22 04:38:56 +00:00
|
|
|
if (fat_register_device(dev_desc, part) != 0) {
|
|
|
|
printf("\n** Unable to use %s %d:%d for fatwrite **\n",
|
|
|
|
argv[1], dev, part);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
addr = simple_strtoul(argv[3], NULL, 16);
|
|
|
|
count = simple_strtoul(argv[5], NULL, 16);
|
|
|
|
|
|
|
|
size = file_fat_write(argv[4], (void *)addr, count);
|
|
|
|
if (size == -1) {
|
|
|
|
printf("\n** Unable to write \"%s\" from %s %d:%d **\n",
|
|
|
|
argv[4], argv[1], dev, part);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
printf("%ld bytes written\n", size);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
|
|
|
fatwrite, 6, 0, do_fat_fswrite,
|
|
|
|
"write file into a dos filesystem",
|
|
|
|
"<interface> <dev[:part]> <addr> <filename> <bytes>\n"
|
|
|
|
" - write file 'filename' from the address 'addr' in RAM\n"
|
|
|
|
" to 'dev' on 'interface'"
|
|
|
|
);
|
|
|
|
#endif
|