projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate mtdparts command from jffs2
[oweals/u-boot.git]
/
common
/
cmd_nand.c
diff --git
a/common/cmd_nand.c
b/common/cmd_nand.c
index aedf8a624e7c978770b7427f90585c12dde0be31..04b3200e57dd4790f4af1c27981af00aae3cf8fe 100644
(file)
--- a/
common/cmd_nand.c
+++ b/
common/cmd_nand.c
@@
-29,7
+29,7
@@
#include <jffs2/jffs2.h>
#include <nand.h>
#include <jffs2/jffs2.h>
#include <nand.h>
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
JFFS2_CMDLINE
)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
CMD_MTDPARTS
)
/* parition handling routines */
int mtdparts_init(void);
/* parition handling routines */
int mtdparts_init(void);
@@
-105,7
+105,7
@@
static int
arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size)
{
int idx = nand_curr_device;
arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size)
{
int idx = nand_curr_device;
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
JFFS2_CMDLINE
)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
CMD_MTDPARTS
)
struct mtd_device *dev;
struct part_info *part;
u8 pnum;
struct mtd_device *dev;
struct part_info *part;
u8 pnum;
@@
-153,7
+153,7
@@
arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size
*size = nand->size - *off;
}
*size = nand->size - *off;
}
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
JFFS2_CMDLINE
)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
CMD_MTDPARTS
)
out:
#endif
printf("device %d ", idx);
out:
#endif
printf("device %d ", idx);
@@
-463,12
+463,12
@@
int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
#endif
usage:
#endif
usage:
-
printf("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return 1;
}
U_BOOT_CMD(nand, 5, 1, do_nand,
return 1;
}
U_BOOT_CMD(nand, 5, 1, do_nand,
- "
nand - NAND sub-system\n
",
+ "
NAND sub-system
",
"info - show available NAND devices\n"
"nand device [dev] - show or set current device\n"
"nand read - addr off|partition size\n"
"info - show available NAND devices\n"
"nand device [dev] - show or set current device\n"
"nand read - addr off|partition size\n"
@@
-502,7
+502,7
@@
static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
s = strchr(cmd, '.');
if (s != NULL &&
s = strchr(cmd, '.');
if (s != NULL &&
- (strcmp(s, ".jffs2") &&
!strcmp(s, ".e") && !
strcmp(s, ".i"))) {
+ (strcmp(s, ".jffs2") &&
strcmp(s, ".e") &&
strcmp(s, ".i"))) {
printf("Unknown nand load suffix '%s'\n", s);
show_boot_progress(-53);
return 1;
printf("Unknown nand load suffix '%s'\n", s);
show_boot_progress(-53);
return 1;
@@
-511,7
+511,7
@@
static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset);
cnt = nand->writesize;
printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset);
cnt = nand->writesize;
- r = nand_read(nand, offset, &cnt, (u_char *) addr);
+ r = nand_read
_skip_bad
(nand, offset, &cnt, (u_char *) addr);
if (r) {
puts("** Read error\n");
show_boot_progress (-56);
if (r) {
puts("** Read error\n");
show_boot_progress (-56);
@@
-543,8
+543,7
@@
static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
}
show_boot_progress (57);
}
show_boot_progress (57);
- /* FIXME: skip bad blocks */
- r = nand_read(nand, offset, &cnt, (u_char *) addr);
+ r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
if (r) {
puts("** Read error\n");
show_boot_progress (-58);
if (r) {
puts("** Read error\n");
show_boot_progress (-58);
@@
-590,7
+589,7
@@
int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
char *boot_device = NULL;
int idx;
ulong addr, offset = 0;
char *boot_device = NULL;
int idx;
ulong addr, offset = 0;
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
JFFS2_CMDLINE
)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
CMD_MTDPARTS
)
struct mtd_device *dev;
struct part_info *part;
u8 pnum;
struct mtd_device *dev;
struct part_info *part;
u8 pnum;
@@
-635,10
+634,10
@@
int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
offset = simple_strtoul(argv[3], NULL, 16);
break;
default:
offset = simple_strtoul(argv[3], NULL, 16);
break;
default:
-#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
JFFS2_CMDLINE
)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_
CMD_MTDPARTS
)
usage:
#endif
usage:
#endif
-
printf("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
show_boot_progress(-53);
return 1;
}
show_boot_progress(-53);
return 1;
}
@@
-664,7
+663,7
@@
usage:
}
U_BOOT_CMD(nboot, 4, 1, do_nandboot,
}
U_BOOT_CMD(nboot, 4, 1, do_nandboot,
- "
nboot - boot from NAND device\n
",
+ "
boot from NAND device
",
"[partition] | [[[loadAddr] dev] offset]\n");
#endif
"[partition] | [[[loadAddr] dev] offset]\n");
#endif
@@
-751,7
+750,7
@@
int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
switch (argc) {
case 0:
case 1:
switch (argc) {
case 0:
case 1:
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return 1;
case 2:
if (strcmp (argv[1], "info") == 0) {
return 1;
case 2:
if (strcmp (argv[1], "info") == 0) {
@@
-789,7
+788,7
@@
int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 0;
}
return 0;
}
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return 1;
case 3:
if (strcmp (argv[1], "device") == 0) {
return 1;
case 3:
if (strcmp (argv[1], "device") == 0) {
@@
-828,7
+827,7
@@
int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return ret;
}
return ret;
}
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return 1;
default:
/* at least 4 args */
return 1;
default:
/* at least 4 args */
@@
-877,7
+876,7
@@
int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
#endif /* CONFIG_SYS_NAND_SKIP_BAD_DOT_I */
else if (cmdtail) {
}
#endif /* CONFIG_SYS_NAND_SKIP_BAD_DOT_I */
else if (cmdtail) {
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
return 1;
}
return 1;
}
@@
-913,7
+912,7
@@
int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return ret;
} else {
return ret;
} else {
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
rcode = 1;
}
rcode = 1;
}
@@
-923,7
+922,7
@@
int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
nand, 5, 1, do_nand,
U_BOOT_CMD(
nand, 5, 1, do_nand,
- "
nand - legacy NAND sub-system\n
",
+ "
legacy NAND sub-system
",
"info - show available NAND devices\n"
"nand device [dev] - show or set current device\n"
"nand read[.jffs2[s]] addr off size\n"
"info - show available NAND devices\n"
"nand device [dev] - show or set current device\n"
"nand read[.jffs2[s]] addr off size\n"
@@
-970,7
+969,7
@@
int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
offset = simple_strtoul(argv[3], NULL, 16);
break;
default:
offset = simple_strtoul(argv[3], NULL, 16);
break;
default:
-
printf ("Usage:\n%s\n", cmdtp->usage
);
+
cmd_usage(cmdtp
);
show_boot_progress (-53);
return 1;
}
show_boot_progress (-53);
return 1;
}
@@
-1072,7
+1071,7
@@
int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
nboot, 4, 1, do_nandboot,
U_BOOT_CMD(
nboot, 4, 1, do_nandboot,
- "
nboot - boot from NAND device\n
",
+ "
boot from NAND device
",
"loadAddr dev\n"
);
"loadAddr dev\n"
);