add ifdefs to proto/ethernet.h so that it does't conflict with linux includes

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

diff --git a/package/openwrt/mtd.c b/package/openwrt/mtd.c
index 37dbd12..13f4bf1 100644 (file)
--- a/package/openwrt/mtd.c
+++ b/package/openwrt/mtd.c
@@ -1,10 +1,8 @@
 /*
- * mtd.c
+ * mtd - simple memory technology device manipulation tool
  *
  * Copyright (C) 2005 Waldemar Brodkorb <wbx@dass-it.de>
  *
- * $Id$
- *
  * 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
@@ -23,6 +21,8 @@
  * it is mainly code from the linux-mtd project, which accepts the same
  * command line arguments as the broadcom utility
  * 
+ * $Id$
+ *
  */
 
 #include <limits.h>
@@ -62,6 +62,7 @@ struct trx_header {
 extern int mtd_open(const char *mtd, int flags);
 extern int mtd_erase(const char *mtd);
 extern int mtd_write(const char *trxfile, const char *mtd);
+extern int mtd_update(const char *trxfile, const char *mtd);
 
 int
 mtd_unlock(const char *mtd)
@@ -228,6 +229,20 @@ mtd_write(const char *trxfile, const char *mtd)
        return 0;
 }
 
+int
+mtd_update(const char *trxfile, const char *mtd)
+{
+       if (mtd_erase("rootfs") != 0) {
+               fprintf(stderr, "Could not erase rootfs\n");
+               exit(1);
+       }
+       if (mtd_write(trxfile, mtd) != 0) {
+               fprintf(stderr, "Could not update %s with %s\n", mtd, trxfile);
+               exit(1);
+       }       
+       return 0;
+}
+
 int main(int argc, char **argv) {
        if(argc == 3 && strcasecmp(argv[1],"unlock")==0) {
                printf("Unlocking %s ...\n",argv[2]);
@@ -241,6 +256,10 @@ int main(int argc, char **argv) {
                printf("Writing %s to %s ...\n",argv[2],argv[3]);
                return mtd_write(argv[2],argv[3]);
        }
+       if(argc == 4 && strcasecmp(argv[1],"update")==0) {
+               printf("Updating %s on %s ...\n",argv[2],argv[3]);
+               return mtd_update(argv[2],argv[3]);
+       }
 
        printf("no valid command given\n");
        printf("\nmtd: modify data within a Memory Technology Device.\n");
@@ -248,11 +267,12 @@ int main(int argc, char **argv) {
        printf("Documented by Mike Strates [dumpedcore] <mike@dilaudid.net>\n");
        printf("mtd has ABSOLUTELY NO WARRANTY and is licensed under the GNU GPL.\n");
        printf("\nUsage: mtd [unlock|erase] device\n");
-       printf("       mtd write imagefile device\n");
-       printf("\n .. where device is in the format of mtdX (eg: mtd4) or its label.\n");
-       printf("\nunlock                enable modification to device\n");
+       printf("       mtd [write|update] imagefile device\n");
+       printf("\n.. where device is in the format of mtdX (eg: mtd4) or its label.\n\n");
+       printf("unlock          enable modification to device\n");
        printf("erase           erase all data on device\n");
        printf("write           write imagefile to device\n");
+       printf("update          remove rootfs and update imagefile on device\n");
        printf("\nExample: To write linux.trx to mtd4 labeled as linux\n");
        printf("\n                mtd unlock linux && mtd write linux.trx linux\n\n");
        return -1;