Update yet again to latest mtd-abi.h from kernel tree. And fix mtd_debug.c.

Again.

Signed-off-by: Josh Boyer <jwboyer@gmail.com>

diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index c11a589bdedf18d73bdb0febec30fcdc6e038632..7ccadb1eaf7d77fc3779a3dead61ced7b52c4c70 100644 (file)
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -24,18 +24,18 @@ struct mtd_oob_buf {
 };
 
 #define MTD_ABSENT             0
-#define MTD_RAM                        1
-#define MTD_ROM                        2
 #define MTD_NORFLASH           3
 #define MTD_NANDFLASH          4
 #define MTD_DATAFLASH          6
+#define MTD_GENERIC_TYPE       7
 
 #define MTD_WRITEABLE          0x400   /* Device is writeable */
 #define MTD_BIT_WRITEABLE      0x800   /* Single bits can be flipped */
+#define MTD_NO_ERASE           0x1000  /* No erase necessary */
 
 // Some common devices / combinations of capabilities
 #define MTD_CAP_ROM            0
-#define MTD_CAP_RAM            (MTD_WRITEABLE | MTD_BIT_WRITEABLE)
+#define MTD_CAP_RAM            (MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE)
 #define MTD_CAP_NORFLASH       (MTD_WRITEABLE | MTD_BIT_WRITEABLE)
 #define MTD_CAP_NANDFLASH      (MTD_WRITEABLE)
 

diff --git a/mtd_debug.c b/mtd_debug.c
index 6ef7e31ea08c84e200c3514411628fd60823b9c7..ee3c67c0db014b65298bb25c6be3102580b121f1 100644 (file)
--- a/mtd_debug.c
+++ b/mtd_debug.c
@@ -260,18 +260,15 @@ int showinfo (int fd)
          case MTD_ABSENT:
                printf ("MTD_ABSENT");
                break;
-         case MTD_RAM:
-               printf ("MTD_RAM");
-               break;
-         case MTD_ROM:
-               printf ("MTD_ROM");
-               break;
          case MTD_NORFLASH:
                printf ("MTD_NORFLASH");
                break;
          case MTD_NANDFLASH:
                printf ("MTD_NANDFLASH");
                break;
+         case MTD_GENERIC_TYPE:
+               printf ("MTD_GENERIC_TYPE");
+               break;
          default:
                printf ("(unknown type - new MTD API maybe?)");
         }