2004-03-25 22:59:05 +08:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2003 - 2004
|
|
|
|
* Sysgo Real-Time Solutions, AG <www.elinos.com>
|
|
|
|
* Pavel Bartusek <pba@sysgo.com>
|
|
|
|
*
|
2013-07-08 15:37:19 +08:00
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
2004-03-25 22:59:05 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reiserfs support
|
|
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
#include <config.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <image.h>
|
|
|
|
#include <linux/ctype.h>
|
|
|
|
#include <asm/byteorder.h>
|
|
|
|
#include <reiserfs.h>
|
2007-02-20 16:04:34 +08:00
|
|
|
#include <part.h>
|
2004-03-25 22:59:05 +08:00
|
|
|
|
|
|
|
#ifndef CONFIG_DOS_PARTITION
|
|
|
|
#error DOS partition support must be selected
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* #define REISER_DEBUG */
|
|
|
|
|
|
|
|
#ifdef REISER_DEBUG
|
|
|
|
#define PRINTF(fmt,args...) printf (fmt ,##args)
|
|
|
|
#else
|
|
|
|
#define PRINTF(fmt,args...)
|
|
|
|
#endif
|
|
|
|
|
2010-06-29 04:00:46 +08:00
|
|
|
int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
2004-03-25 22:59:05 +08:00
|
|
|
{
|
|
|
|
char *filename = "/";
|
2012-08-23 19:31:50 +08:00
|
|
|
int dev, part;
|
2004-03-25 22:59:05 +08:00
|
|
|
block_dev_desc_t *dev_desc=NULL;
|
2012-08-23 19:31:50 +08:00
|
|
|
disk_partition_t info;
|
2004-03-25 22:59:05 +08:00
|
|
|
|
2010-07-17 07:06:04 +08:00
|
|
|
if (argc < 3)
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2010-07-17 07:06:04 +08: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 17:50:57 +08:00
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
2012-08-23 19:31:50 +08:00
|
|
|
if (part < 0)
|
2004-03-25 22:59:05 +08:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (argc == 4) {
|
|
|
|
filename = argv[3];
|
|
|
|
}
|
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
dev = dev_desc->dev;
|
2004-03-25 22:59:05 +08:00
|
|
|
PRINTF("Using device %s %d:%d, directory: %s\n", argv[1], dev, part, filename);
|
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
reiserfs_set_blk_dev(dev_desc, &info);
|
2004-03-25 22:59:05 +08:00
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
if (!reiserfs_mount(info.size)) {
|
2007-06-23 01:11:54 +08:00
|
|
|
printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part);
|
2004-03-25 22:59:05 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reiserfs_ls (filename)) {
|
|
|
|
printf ("** Error reiserfs_ls() **\n");
|
|
|
|
return 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
|
|
|
reiserls, 4, 1, do_reiserls,
|
2009-01-28 08:03:12 +08:00
|
|
|
"list files in a directory (default /)",
|
2004-03-25 22:59:05 +08:00
|
|
|
"<interface> <dev[:part]> [directory]\n"
|
2009-05-24 23:06:54 +08:00
|
|
|
" - list files from 'dev' on 'interface' in a 'directory'"
|
2004-03-25 22:59:05 +08:00
|
|
|
);
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Reiserfs boot command intepreter. Derived from diskboot
|
|
|
|
*/
|
2010-06-29 04:00:46 +08:00
|
|
|
int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
2004-03-25 22:59:05 +08:00
|
|
|
{
|
|
|
|
char *filename = NULL;
|
2012-08-23 19:31:50 +08:00
|
|
|
int dev, part;
|
|
|
|
ulong addr = 0, filelen;
|
2004-03-25 22:59:05 +08:00
|
|
|
disk_partition_t info;
|
|
|
|
block_dev_desc_t *dev_desc = NULL;
|
|
|
|
unsigned long count;
|
|
|
|
char *addr_str;
|
|
|
|
|
|
|
|
switch (argc) {
|
|
|
|
case 3:
|
|
|
|
addr_str = getenv("loadaddr");
|
|
|
|
if (addr_str != NULL) {
|
|
|
|
addr = simple_strtoul (addr_str, NULL, 16);
|
|
|
|
} else {
|
2008-10-16 21:01:15 +08:00
|
|
|
addr = CONFIG_SYS_LOAD_ADDR;
|
2004-03-25 22:59:05 +08:00
|
|
|
}
|
|
|
|
filename = getenv ("bootfile");
|
|
|
|
count = 0;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
addr = simple_strtoul (argv[3], NULL, 16);
|
|
|
|
filename = getenv ("bootfile");
|
|
|
|
count = 0;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
addr = simple_strtoul (argv[3], NULL, 16);
|
|
|
|
filename = argv[4];
|
|
|
|
count = 0;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
addr = simple_strtoul (argv[3], NULL, 16);
|
|
|
|
filename = argv[4];
|
|
|
|
count = simple_strtoul (argv[5], NULL, 16);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2004-03-25 22:59:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!filename) {
|
|
|
|
puts ("\n** No boot file defined **\n");
|
|
|
|
return 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 17:50:57 +08:00
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
2012-08-23 19:31:50 +08:00
|
|
|
if (part < 0)
|
2004-03-25 22:59:05 +08:00
|
|
|
return 1;
|
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
dev = dev_desc->dev;
|
2004-03-25 22:59:05 +08:00
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
printf("Loading file \"%s\" from %s device %d%c%c\n",
|
|
|
|
filename, argv[1], dev,
|
|
|
|
part ? ':' : ' ', part ? part + '0' : ' ');
|
2004-03-25 22:59:05 +08:00
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
reiserfs_set_blk_dev(dev_desc, &info);
|
2004-03-25 22:59:05 +08:00
|
|
|
|
2012-08-23 19:31:50 +08:00
|
|
|
if (!reiserfs_mount(info.size)) {
|
2007-06-23 01:11:54 +08:00
|
|
|
printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n", argv[1], dev, part);
|
2004-03-25 22:59:05 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
filelen = reiserfs_open(filename);
|
|
|
|
if (filelen < 0) {
|
2013-10-10 07:32:27 +08:00
|
|
|
printf("** File not found %s **\n", filename);
|
2004-03-25 22:59:05 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if ((count < filelen) && (count != 0)) {
|
|
|
|
filelen = count;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reiserfs_read((char *)addr, filelen) != filelen) {
|
|
|
|
printf("\n** Unable to read \"%s\" from %s %d:%d **\n", filename, argv[1], dev, part);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Loading ok, update default load address */
|
|
|
|
load_addr = addr;
|
|
|
|
|
|
|
|
printf ("\n%ld bytes read\n", filelen);
|
2013-02-25 01:33:22 +08:00
|
|
|
setenv_hex("filesize", filelen);
|
2004-03-25 22:59:05 +08:00
|
|
|
|
|
|
|
return filelen;
|
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
|
|
|
reiserload, 6, 0, do_reiserload,
|
2009-01-28 08:03:12 +08:00
|
|
|
"load binary file from a Reiser filesystem",
|
2004-03-25 22:59:05 +08:00
|
|
|
"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
|
|
|
|
" - load binary file 'filename' from 'dev' on 'interface'\n"
|
2009-05-24 23:06:54 +08:00
|
|
|
" to address 'addr' from dos filesystem"
|
2004-03-25 22:59:05 +08:00
|
|
|
);
|