projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
General help message cleanup
[platform/kernel/u-boot.git]
/
common
/
cmd_ext2.c
diff --git
a/common/cmd_ext2.c
b/common/cmd_ext2.c
index
f569406
..
6ee60c6
100644
(file)
--- a/
common/cmd_ext2.c
+++ b/
common/cmd_ext2.c
@@
-44,8
+44,8
@@
#include <usb.h>
#endif
#include <usb.h>
#endif
-#if
ndef CONFIG_DOS_PARTITION
-#error DOS partition support must be selected
+#if
!defined(CONFIG_DOS_PARTITION) && !defined(CONFIG_EFI_PARTITION)
+#error DOS
or EFI
partition support must be selected
#endif
/* #define EXT2_DEBUG */
#endif
/* #define EXT2_DEBUG */
@@
-66,7
+66,7
@@
int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
int part_length;
if (argc < 3) {
int part_length;
if (argc < 3) {
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return(1);
}
dev = (int)simple_strtoul (argv[2], &ep, 16);
return(1);
}
dev = (int)simple_strtoul (argv[2], &ep, 16);
@@
-116,9
+116,9
@@
int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
ext2ls, 4, 1, do_ext2ls,
U_BOOT_CMD(
ext2ls, 4, 1, do_ext2ls,
- "
ext2ls - list files in a directory (default /)\n
",
+ "
list files in a directory (default /)
",
"<interface> <dev[:part]> [directory]\n"
"<interface> <dev[:part]> [directory]\n"
- " - list files from 'dev' on 'interface' in a 'directory'
\n
"
+ " - list files from 'dev' on 'interface' in a 'directory'"
);
/******************************************************************************
);
/******************************************************************************
@@
-129,7
+129,8
@@
int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *filename = NULL;
char *ep;
int dev, part = 1;
char *filename = NULL;
char *ep;
int dev, part = 1;
- ulong addr = 0, part_length, filelen;
+ ulong addr = 0, part_length;
+ int filelen;
disk_partition_t info;
block_dev_desc_t *dev_desc = NULL;
char buf [12];
disk_partition_t info;
block_dev_desc_t *dev_desc = NULL;
char buf [12];
@@
-142,7
+143,7
@@
int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (addr_str != NULL) {
addr = simple_strtoul (addr_str, NULL, 16);
} else {
if (addr_str != NULL) {
addr = simple_strtoul (addr_str, NULL, 16);
} else {
- addr = C
FG
_LOAD_ADDR;
+ addr = C
ONFIG_SYS
_LOAD_ADDR;
}
filename = getenv ("bootfile");
count = 0;
}
filename = getenv ("bootfile");
count = 0;
@@
-164,7
+165,7
@@
int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
break;
default:
break;
default:
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return(1);
}
return(1);
}
@@
-243,8
+244,8
@@
int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* Loading ok, update default load address */
load_addr = addr;
/* Loading ok, update default load address */
load_addr = addr;
- printf ("\n%
l
d bytes read\n", filelen);
- sprintf(buf, "%
l
X", filelen);
+ printf ("\n%d bytes read\n", filelen);
+ sprintf(buf, "%X", filelen);
setenv("filesize", buf);
return(filelen);
setenv("filesize", buf);
return(filelen);
@@
-252,8
+253,8
@@
int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
ext2load, 6, 0, do_ext2load,
U_BOOT_CMD(
ext2load, 6, 0, do_ext2load,
- "
ext2load- load binary file from a Ext2 filesystem\n
",
+ "
load binary file from a Ext2 filesystem
",
"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
" - load binary file 'filename' from 'dev' on 'interface'\n"
"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
" - load binary file 'filename' from 'dev' on 'interface'\n"
- " to address 'addr' from ext2 filesystem
\n
"
+ " to address 'addr' from ext2 filesystem"
);
);