X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmtd%2Fsrc%2Fmtd.c;h=d14b196bc0a70bf001e670c0ec7d6e606a512869;hp=3e84fd696e35b89c869d2f6bd27201686c73d7cf;hb=da238c8db0481a8ca7fc9bd8db463540d5c0c897;hpb=8d8410e51371920f20781489b9da386ed08889cd diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index 3e84fd696e..d14b196bc0 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -1,13 +1,12 @@ /* * mtd - simple memory technology device manipulation tool * - * Copyright (C) 2005 Waldemar Brodkorb , - * Felix Fietkau + * Copyright (C) 2005 Waldemar Brodkorb , + * Copyright (C) 2005-2009 Felix Fietkau * * 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. + * modify it under the terms of the GNU General Public License v2 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id$ * * The code is based on the linux-mtd examples. */ @@ -44,24 +42,18 @@ #include #include #include "mtd-api.h" +#include "fis.h" #include "mtd.h" #define MAX_ARGS 8 #define JFFS2_DEFAULT_DIR "" /* directory name without /, empty means root dir */ -struct trx_header { - uint32_t magic; /* "HDR0" */ - uint32_t len; /* Length of file including header */ - uint32_t crc32; /* 32-bit CRC from flag_version to end of file */ - uint32_t flag_version; /* 0:15 flags, 16:31 version */ - uint32_t offsets[3]; /* Offsets of partitions from start of header */ -}; - static char *buf = NULL; static char *imagefile = NULL; static char *jffs2file = NULL, *jffs2dir = JFFS2_DEFAULT_DIR; static int buflen = 0; int quiet; +int no_erase; int mtdsize = 0; int erasesize = 0; @@ -99,13 +91,13 @@ int mtd_check_open(const char *mtd) fd = mtd_open(mtd, false); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); - return 0; + return -1; } if(ioctl(fd, MEMGETINFO, &mtdInfo)) { fprintf(stderr, "Could not get MTD device info from %s\n", mtd); close(fd); - return 0; + return -1; } mtdsize = mtdInfo.size; erasesize = mtdInfo.erasesize; @@ -120,10 +112,9 @@ int mtd_erase_block(int fd, int offset) mtdEraseInfo.start = offset; mtdEraseInfo.length = erasesize; ioctl(fd, MEMUNLOCK, &mtdEraseInfo); - if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0) { - fprintf(stderr, "Erasing mtd failed.\n"); - exit(1); - } + if (ioctl (fd, MEMERASE, &mtdEraseInfo) < 0) + return -1; + return 0; } @@ -139,50 +130,86 @@ static int image_check(int imagefd, const char *mtd) { int ret = 1; -#ifdef target_brcm - ret = trx_check(imagefd, mtd, buf, &buflen); -#endif + if (trx_check) { + ret = trx_check(imagefd, mtd, buf, &buflen); + } return ret; } static int mtd_check(const char *mtd) { + char *next = NULL; + char *str = NULL; int fd; - fd = mtd_check_open(mtd); - if (!fd) - return 0; + if (strchr(mtd, ':')) { + str = strdup(mtd); + mtd = str; + } - if (!buf) - buf = malloc(erasesize); + do { + next = strchr(mtd, ':'); + if (next) { + *next = 0; + next++; + } + + fd = mtd_check_open(mtd); + if (fd < 0) + return 0; + + if (!buf) + buf = malloc(erasesize); + + close(fd); + mtd = next; + } while (next); + + if (str) + free(str); - close(fd); return 1; } static int mtd_unlock(const char *mtd) { - int fd; struct erase_info_user mtdLockInfo; + char *next = NULL; + char *str = NULL; + int fd; - fd = mtd_check_open(mtd); - if(fd <= 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); + if (strchr(mtd, ':')) { + str = strdup(mtd); + mtd = str; } - if (quiet < 2) - fprintf(stderr, "Unlocking %s ...\n", mtd); + do { + next = strchr(mtd, ':'); + if (next) { + *next = 0; + next++; + } + + fd = mtd_check_open(mtd); + if(fd < 0) { + fprintf(stderr, "Could not open mtd device: %s\n", mtd); + exit(1); + } + + if (quiet < 2) + fprintf(stderr, "Unlocking %s ...\n", mtd); - mtdLockInfo.start = 0; - mtdLockInfo.length = mtdsize; - if(ioctl(fd, MEMUNLOCK, &mtdLockInfo)) { + mtdLockInfo.start = 0; + mtdLockInfo.length = mtdsize; + ioctl(fd, MEMUNLOCK, &mtdLockInfo); close(fd); - return 0; - } - - close(fd); + mtd = next; + } while (next); + + if (str) + free(str); + return 0; } @@ -196,7 +223,7 @@ mtd_erase(const char *mtd) fprintf(stderr, "Erasing %s ...\n", mtd); fd = mtd_check_open(mtd); - if(fd <= 0) { + if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } @@ -206,11 +233,11 @@ mtd_erase(const char *mtd) for (mtdEraseInfo.start = 0; mtdEraseInfo.start < mtdsize; mtdEraseInfo.start += erasesize) { - + ioctl(fd, MEMUNLOCK, &mtdEraseInfo); if(ioctl(fd, MEMERASE, &mtdEraseInfo)) fprintf(stderr, "Failed to erase block on %s at 0x%x\n", mtd, mtdEraseInfo.start); - } + } close(fd); return 0; @@ -226,7 +253,7 @@ mtd_refresh(const char *mtd) fprintf(stderr, "Refreshing mtd partition %s ... ", mtd); fd = mtd_check_open(mtd); - if(fd <= 0) { + if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } @@ -244,28 +271,107 @@ mtd_refresh(const char *mtd) return 0; } +static void +indicate_writing(const char *mtd) +{ + if (quiet < 2) + fprintf(stderr, "\nWriting from %s to %s ... ", imagefile, mtd); + + if (!quiet) + fprintf(stderr, " [ ]"); +} + static int -mtd_write(int imagefd, const char *mtd) +mtd_write(int imagefd, const char *mtd, char *fis_layout) { + char *next = NULL; + char *str = NULL; int fd, result; ssize_t r, w, e; + ssize_t skip = 0; + uint32_t offset = 0; + +#ifdef FIS_SUPPORT + static struct fis_part new_parts[MAX_ARGS]; + static struct fis_part old_parts[MAX_ARGS]; + int n_new = 0, n_old = 0; + + if (fis_layout) { + const char *tmp = mtd; + char *word, *brkt; + int ret; + + memset(&old_parts, 0, sizeof(old_parts)); + memset(&new_parts, 0, sizeof(new_parts)); + + do { + next = strchr(tmp, ':'); + if (!next) + next = (char *) tmp + strlen(tmp); + + memcpy(old_parts[n_old].name, tmp, next - tmp); + + n_old++; + tmp = next + 1; + } while(*next); + + for (word = strtok_r(fis_layout, ",", &brkt); + word; + word = strtok_r(NULL, ",", &brkt)) { + + tmp = strtok(word, ":"); + strncpy((char *) new_parts[n_new].name, tmp, sizeof(new_parts[n_new].name) - 1); + + tmp = strtok(NULL, ":"); + if (!tmp) + goto next; + + new_parts[n_new].size = strtoul(tmp, NULL, 0); + + tmp = strtok(NULL, ":"); + if (!tmp) + goto next; + + new_parts[n_new].loadaddr = strtoul(tmp, NULL, 16); +next: + n_new++; + } + ret = fis_validate(old_parts, n_old, new_parts, n_new); + if (ret < 0) { + fprintf(stderr, "Failed to validate the new FIS partition table\n"); + exit(1); + } + if (ret == 0) + fis_layout = NULL; + } +#endif + + if (strchr(mtd, ':')) { + str = strdup(mtd); + mtd = str; + } + + r = 0; + +resume: + next = strchr(mtd, ':'); + if (next) { + *next = 0; + next++; + } fd = mtd_check_open(mtd); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); } - - if (quiet < 2) - fprintf(stderr, "Writing from %s to %s ... ", imagefile, mtd); - r = w = e = 0; - if (!quiet) - fprintf(stderr, " [ ]"); + indicate_writing(mtd); + w = e = 0; for (;;) { - /* buffer may contain data already (from trx check) */ - do { + /* buffer may contain data already (from trx check or last mtd partition write attempt) */ + while (buflen < erasesize) { r = read(imagefd, buf + buflen, erasesize - buflen); if (r < 0) { if ((errno == EINTR) || (errno == EAGAIN)) @@ -276,26 +382,39 @@ mtd_write(int imagefd, const char *mtd) } } - if (r == 0) { - fprintf(stderr, "No more data left\n"); + if (r == 0) break; - } buflen += r; - } while (buflen < erasesize); + } if (buflen == 0) break; + if (skip > 0) { + skip -= buflen; + buflen = 0; + if (skip <= 0) + indicate_writing(mtd); + + continue; + } + if (jffs2file) { - if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF)) == 0) { + if (memcmp(buf, JFFS2_EOF, sizeof(JFFS2_EOF) - 1) == 0) { if (!quiet) fprintf(stderr, "\b\b\b "); if (quiet < 2) - fprintf(stderr, "\nAppending jffs2 data to from %s to %s...", jffs2file, mtd); + fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd); /* got an EOF marker - this is the place to add some jffs2 data */ - mtd_replace_jffs2(mtd, fd, e, jffs2file); - goto done; + skip = mtd_replace_jffs2(mtd, fd, e, jffs2file); + + w += skip; + e += skip; + skip -= buflen; + buflen = 0; + offset = 0; + continue; } /* no EOF marker, make sure we figure out the last inode number * before appending some data */ @@ -303,20 +422,40 @@ mtd_write(int imagefd, const char *mtd) } /* need to erase the next block before writing data to it */ - while (w + buflen > e) { - if (!quiet) - fprintf(stderr, "\b\b\b[e]"); - - mtd_erase_block(fd, e); + if(!no_erase) + { + while (w + buflen > e) { + if (!quiet) + fprintf(stderr, "\b\b\b[e]"); + + + if (mtd_erase_block(fd, e) < 0) { + if (next) { + if (w < e) { + write(fd, buf + offset, e - w); + offset = e - w; + } + w = 0; + e = 0; + close(fd); + mtd = next; + fprintf(stderr, "\b\b\b \n"); + goto resume; + } else { + fprintf(stderr, "Failed to erase block\n"); + exit(1); + } + } - /* erase the chunk */ - e += erasesize; + /* erase the chunk */ + e += erasesize; + } } - + if (!quiet) fprintf(stderr, "\b\b\b[w]"); - - if ((result = write(fd, buf, buflen)) < buflen) { + + if ((result = write(fd, buf + offset, buflen)) < buflen) { if (result < 0) { fprintf(stderr, "Error writing image.\n"); exit(1); @@ -328,36 +467,62 @@ mtd_write(int imagefd, const char *mtd) w += buflen; buflen = 0; + offset = 0; } + if (!quiet) - fprintf(stderr, "\b\b\b\b"); + fprintf(stderr, "\b\b\b\b "); done: if (quiet < 2) fprintf(stderr, "\n"); +#ifdef FIS_SUPPORT + if (fis_layout) { + if (fis_remap(old_parts, n_old, new_parts, n_new) < 0) + fprintf(stderr, "Failed to update the FIS partition table\n"); + } +#endif + close(fd); return 0; } static void usage(void) { - fprintf(stderr, "Usage: mtd [ ...] [ ...] \n\n" + fprintf(stderr, "Usage: mtd [ ...] [ ...] [:...]\n\n" "The device is in the format of mtdX (eg: mtd4) or its label.\n" "mtd recognizes these commands:\n" " unlock unlock the device\n" " refresh refresh mtd partition\n" " erase erase all data on device\n" " write |- write (use - for stdin) to device\n" - " jffs2write append to the jffs2 partition on the device\n" + " jffs2write append to the jffs2 partition on the device\n"); + if (mtd_fixtrx) { + fprintf(stderr, + " fixtrx fix the checksum in a trx header on first boot\n"); + } + fprintf(stderr, "Following options are available:\n" " -q quiet mode (once: no [w] on writing,\n" " twice: no status messages)\n" + " -n write without first erasing the blocks\n" " -r reboot after successful command\n" " -f force write without trx checks\n" " -e erase before executing the command\n" " -d directory for jffs2write, defaults to \"tmp\"\n" - " -j integrate into jffs2 data when writing an image\n" + " -j integrate into jffs2 data when writing an image\n"); + if (mtd_fixtrx) { + fprintf(stderr, + " -o offset offset of the image header in the partition(for fixtrx)\n"); + } + fprintf(stderr, +#ifdef FIS_SUPPORT + " -F [:[:]][,...]\n" + " alter the fis partition table to create new partitions replacing\n" + " the partitions provided as argument to the write command\n" + " (only valid together with the write command)\n" +#endif "\n" "Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n" " mtd -r write linux.trx linux\n\n"); @@ -381,21 +546,29 @@ int main (int argc, char **argv) { int ch, i, boot, imagefd = 0, force, unlocked; char *erase[MAX_ARGS], *device = NULL; + char *fis_layout = NULL; + size_t offset = 0; enum { CMD_ERASE, CMD_WRITE, CMD_UNLOCK, CMD_REFRESH, - CMD_JFFS2WRITE + CMD_JFFS2WRITE, + CMD_FIXTRX, } cmd = -1; - + erase[0] = NULL; boot = 0; force = 0; buflen = 0; quiet = 0; + no_erase = 0; - while ((ch = getopt(argc, argv, "frqe:d:j:")) != -1) + while ((ch = getopt(argc, argv, +#ifdef FIS_SUPPORT + "F:" +#endif + "frnqe:d:j:o:")) != -1) switch (ch) { case 'f': force = 1; @@ -403,6 +576,9 @@ int main (int argc, char **argv) case 'r': boot = 1; break; + case 'n': + no_erase = 1; + break; case 'j': jffs2file = optarg; break; @@ -413,20 +589,37 @@ int main (int argc, char **argv) i = 0; while ((erase[i] != NULL) && ((i + 1) < MAX_ARGS)) i++; - + erase[i++] = optarg; erase[i] = NULL; break; case 'd': jffs2dir = optarg; break; + case 'o': + if (!mtd_fixtrx) { + fprintf(stderr, "-o: Only for brcm47xx\n"); + usage(); + } + errno = 0; + offset = strtoul(optarg, 0, 0); + if (errno) { + fprintf(stderr, "-o: illegal numeric string\n"); + usage(); + } + break; +#ifdef FIS_SUPPORT + case 'F': + fis_layout = optarg; + break; +#endif case '?': default: usage(); } argc -= optind; argv += optind; - + if (argc < 2) usage(); @@ -439,10 +632,13 @@ int main (int argc, char **argv) } else if ((strcmp(argv[0], "erase") == 0) && (argc == 2)) { cmd = CMD_ERASE; device = argv[1]; + } else if (((strcmp(argv[0], "fixtrx") == 0) && (argc == 2)) && mtd_fixtrx) { + cmd = CMD_FIXTRX; + device = argv[1]; } else if ((strcmp(argv[0], "write") == 0) && (argc == 3)) { cmd = CMD_WRITE; device = argv[2]; - + if (strcmp(argv[1], "-") == 0) { imagefile = ""; imagefd = 0; @@ -453,7 +649,7 @@ int main (int argc, char **argv) exit(1); } } - + if (!mtd_check(device)) { fprintf(stderr, "Can't open device for writing!\n"); exit(1); @@ -466,7 +662,7 @@ int main (int argc, char **argv) } else if ((strcmp(argv[0], "jffs2write") == 0) && (argc == 3)) { cmd = CMD_JFFS2WRITE; device = argv[2]; - + imagefile = argv[1]; if (!mtd_check(device)) { fprintf(stderr, "Can't open device for writing!\n"); @@ -477,7 +673,7 @@ int main (int argc, char **argv) } sync(); - + i = 0; unlocked = 0; while (erase[i] != NULL) { @@ -487,8 +683,7 @@ int main (int argc, char **argv) unlocked = 1; i++; } - - + switch (cmd) { case CMD_UNLOCK: if (!unlocked) @@ -502,7 +697,7 @@ int main (int argc, char **argv) case CMD_WRITE: if (!unlocked) mtd_unlock(device); - mtd_write(imagefd, device); + mtd_write(imagefd, device, fis_layout); break; case CMD_JFFS2WRITE: if (!unlocked) @@ -512,10 +707,15 @@ int main (int argc, char **argv) case CMD_REFRESH: mtd_refresh(device); break; + case CMD_FIXTRX: + if (mtd_fixtrx) { + mtd_fixtrx(device, offset); + } + break; } sync(); - + if (boot) do_reboot();