Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / include / mtd / ubi-user.h

diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index cd81ef965c84f7517051f61af9e2a40c7d09372f..8d472cc01380efd9570631fe8f2c9b398c7d1865 100644 (file)
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -271,6 +271,20 @@ struct ubi_attach_req {
        __s8 padding[10];
 };
 
+/*
+ * UBI volume flags.
+ *
+ * @UBI_VOL_SKIP_CRC_CHECK_FLG: skip the CRC check done on a static volume at
+ *                             open time. Only valid for static volumes and
+ *                             should only be used if the volume user has a
+ *                             way to verify data integrity
+ */
+enum {
+       UBI_VOL_SKIP_CRC_CHECK_FLG = 0x1,
+};
+
+#define UBI_VOL_VALID_FLGS     (UBI_VOL_SKIP_CRC_CHECK_FLG)
+
 /**
  * struct ubi_mkvol_req - volume description data structure used in
  *                        volume creation requests.
@@ -278,7 +292,7 @@ struct ubi_attach_req {
  * @alignment: volume alignment
  * @bytes: volume size in bytes
  * @vol_type: volume type (%UBI_DYNAMIC_VOLUME or %UBI_STATIC_VOLUME)
- * @padding1: reserved for future, not used, has to be zeroed
+ * @flags: volume flags (%UBI_VOL_SKIP_CRC_CHECK_FLG)
  * @name_len: volume name length
  * @padding2: reserved for future, not used, has to be zeroed
  * @name: volume name
@@ -307,7 +321,7 @@ struct ubi_mkvol_req {
        __s32 alignment;
        __s64 bytes;
        __s8 vol_type;
-       __s8 padding1;
+       __u8 flags;
        __s16 name_len;
        __s8 padding2[4];
        char name[UBI_MAX_VOLUME_NAME + 1];