[cobalt] add diag.sh to report boot status on the front-led of the machine

[openwrt.git] / package / mtd / src / jffs2.c

diff --git a/package/mtd/src/jffs2.c b/package/mtd/src/jffs2.c
index 3b47d41..c683b51 100644 (file)
--- a/package/mtd/src/jffs2.c
+++ b/package/mtd/src/jffs2.c
@@ -7,13 +7,18 @@
 #include <string.h>
 #include <dirent.h>
 #include <unistd.h>
+#include <endian.h>
 #include "jffs2.h"
 #include "crc32.h"
 #include "mtd.h"
 
 #define PAD(x) (((x)+3)&~3)
 
-#define CLEANMARKER "\x85\x19\x03\x20\x0c\x00\x00\x00\xb1\xb0\x1e\xe4"
+#if BYTE_ORDER == BIG_ENDIAN
+# define CLEANMARKER "\x19\x85\x20\x03\x00\x00\x00\x0c\xf0\x60\xdc\x98"
+#else
+# define CLEANMARKER "\x85\x19\x03\x20\x0c\x00\x00\x00\xb1\xb0\x1e\xe4"
+#endif
 
 static int last_ino = 0;
 static int last_version = 0;
@@ -135,7 +140,6 @@ static void add_file(const char *name, int parent)
        struct stat st;
        char wbuf[4096];
        const char *fname;
-       FILE *f;
 
        if (stat(name, &st)) {
                fprintf(stderr, "File %s does not exist\n", name);
@@ -205,7 +209,7 @@ static void add_file(const char *name, int parent)
        close(fd);
 }
 
-int mtd_replace_jffs2(int fd, int ofs, const char *filename)
+int mtd_replace_jffs2(const char *mtd, int fd, int ofs, const char *filename)
 {
        outfd = fd;
        mtdofs = ofs;
@@ -221,6 +225,11 @@ int mtd_replace_jffs2(int fd, int ofs, const char *filename)
        add_data(JFFS2_EOF, sizeof(JFFS2_EOF) - 1);
        pad(erasesize);
        free(buf);
+
+#ifdef target_brcm
+       trx_fixup(outfd, mtd);
+#endif
+       return 0;
 }
 
 void mtd_parse_jffs2data(const char *buf, const char *dir)
@@ -238,7 +247,7 @@ void mtd_parse_jffs2data(const char *buf, const char *dir)
                        struct jffs2_raw_dirent *de = (struct jffs2_raw_dirent *) node;
 
                        /* is this the right directory name and is it a subdirectory of / */
-                       if (*dir && (de->pino == 1) && !strncmp(de->name, dir, de->nsize))
+                       if (*dir && (de->pino == 1) && !strncmp((char *) de->name, dir, de->nsize))
                                target_ino = de->ino;
 
                        /* store the last inode and version numbers for adding extra files */
@@ -253,7 +262,6 @@ void mtd_parse_jffs2data(const char *buf, const char *dir)
 int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir)
 {
        int err = -1, fdeof = 0;
-       off_t offset;
 
        outfd = mtd_check_open(mtd);
        if (!outfd)
@@ -321,6 +329,10 @@ int mtd_write_jffs2(const char *mtd, const char *filename, const char *dir)
 
        err = 0;
 
+#ifdef target_brcm
+       trx_fixup(outfd, mtd);
+#endif
+
 done:
        close(outfd);
        if (buf)