diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-11 00:29:27 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-11 00:29:27 +0200 |
| commit | 9c73f4b81172bc9f1b8f132450e69bcfb5b960ca (patch) | |
| tree | b20402ff5f80a91423b9d444ba5b947d36cd06ff /common/cmd_nand.c | |
| parent | 78cff50edba6b1508eb15c2f53ce966ac891eb9e (diff) | |
| parent | e251e00d0db4b36d1d2b7e38fec43a7296b529a2 (diff) | |
| download | u-boot-9c73f4b81172bc9f1b8f132450e69bcfb5b960ca.tar.gz u-boot-9c73f4b81172bc9f1b8f132450e69bcfb5b960ca.tar.xz u-boot-9c73f4b81172bc9f1b8f132450e69bcfb5b960ca.zip | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index c72612d0d6..254a7755fc 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -468,14 +468,31 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, ulong offset, ulong addr, char *cmd) { int r; - char *ep; + char *ep, *s; ulong cnt; image_header_t *hdr; + int jffs2 = 0; + + s = strchr(cmd, '.'); + if (s != NULL && + (!strcmp(s, ".jffs2") || !strcmp(s, ".e") || !strcmp(s, ".i"))) + jffs2 = 1; printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset); cnt = nand->oobblock; - r = nand_read(nand, offset, &cnt, (u_char *) addr); + if (jffs2) { + nand_read_options_t opts; + memset(&opts, 0, sizeof(opts)); + opts.buffer = (u_char*) addr; + opts.length = cnt; + opts.offset = offset; + opts.quiet = 1; + r = nand_read_opts(nand, &opts); + } else { + r = nand_read(nand, offset, &cnt, (u_char *) addr); + } + if (r) { puts("** Read error\n"); show_boot_progress (-56); @@ -495,8 +512,18 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, print_image_hdr(hdr); cnt = (ntohl(hdr->ih_size) + sizeof (image_header_t)); + if (jffs2) { + nand_read_options_t opts; + memset(&opts, 0, sizeof(opts)); + opts.buffer = (u_char*) addr; + opts.length = cnt; + opts.offset = offset; + opts.quiet = 1; + r = nand_read_opts(nand, &opts); + } else { + r = nand_read(nand, offset, &cnt, (u_char *) addr); + } - r = nand_read(nand, offset, &cnt, (u_char *) addr); if (r) { puts("** Read error\n"); show_boot_progress (-58); @@ -545,7 +572,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) if (argc > 3) goto usage; if (argc == 3) - addr = simple_strtoul(argv[2], NULL, 16); + addr = simple_strtoul(argv[1], NULL, 16); else addr = CFG_LOAD_ADDR; return nand_load_image(cmdtp, &nand_info[dev->id->num], @@ -604,7 +631,7 @@ usage: U_BOOT_CMD(nboot, 4, 1, do_nandboot, "nboot - boot from NAND device\n", - "[partition] | [[[loadAddr] dev] offset]\n"); + "[.jffs2] [partition] | [[[loadAddr] dev] offset]\n"); #endif |