diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-17 07:26:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-17 07:26:16 -0400 |
| commit | a2fce50455c9831f36765e5813b0b5e98f55d70b (patch) | |
| tree | 4a0d4bfaf6392a1639b93ce4f09e9f0f68aa63b9 /include | |
| parent | c83b1bb923421e95e499b22b010d2f9f463c1226 (diff) | |
| parent | 611623417403256dc79205a89d4dc7f826bc805f (diff) | |
Merge tag 'for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot-ubi
ubi enhancements for 2020.01
- provide a way for skipping crc checks ported from linux, and add an
U-Boot command to set this flag on already installed systems.
- fix redundand environment management
Diffstat (limited to 'include')
| -rw-r--r-- | include/env_internal.h | 2 | ||||
| -rw-r--r-- | include/mtd/ubi-user.h | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/include/env_internal.h b/include/env_internal.h index b1ddcb5adf..88c36b32a1 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -101,7 +101,7 @@ extern unsigned long nand_env_oob_offset; # ifndef CONFIG_ENV_UBI_VOLUME # error "Need to define CONFIG_ENV_UBI_VOLUME when using CONFIG_ENV_IS_IN_UBI" # endif -# if defined(CONFIG_ENV_UBI_VOLUME_REDUND) +# if defined(CONFIG_ENV_UBI_IS_VOLUME_REDUND) # define CONFIG_SYS_REDUNDAND_ENVIRONMENT # endif # ifndef CONFIG_ENV_SIZE diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index cd81ef965c..8d472cc013 100644 --- 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]; |