There are no spare values in spec v0.9 so drop them.
For now they are still present in the headers, with an underscore, so that tests continue to pass.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/bloblist.c | 1 - include/bloblist.h | 6 ++---- test/bloblist.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/common/bloblist.c b/common/bloblist.c index 73f93687015..96b82fe625c 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -154,7 +154,6 @@ static int bloblist_addrec(uint tag, int size, int align_log2, rec->tag = tag; rec->hdr_size = data_start - hdr->alloced; rec->size = size; - rec->spare = 0;
/* Zero the record data */ memset((void *)rec + rec_hdr_size(rec), '\0', rec->size); diff --git a/include/bloblist.h b/include/bloblist.h index 0b1aaf3253e..6592ea75403 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -156,7 +156,6 @@ enum bloblist_tag_t { * @alloced: Total size allocated so far for this bloblist. This starts out as * sizeof(bloblist_hdr) since we need at least that much space to store a * valid bloblist - * @spare: Spare space (for future use) * @chksum: CRC32 for the entire bloblist allocated area. Since any of the * blobs can be altered after being created, this checksum is only valid * when the bloblist is finalised before jumping to the next stage of boot. @@ -171,7 +170,7 @@ struct bloblist_hdr {
u32 size; u32 alloced; - u32 spare; + u32 _spare; u32 chksum; };
@@ -188,13 +187,12 @@ struct bloblist_hdr { * record's data starts at this offset from the start of the record * @size: Size of record in bytes, excluding the header size. This does not * need to be aligned (e.g. 3 is OK). - * @spare: Spare space for other things */ struct bloblist_rec { u32 tag; u32 hdr_size; u32 size; - u32 spare; + u32 _spare; };
/** diff --git a/test/bloblist.c b/test/bloblist.c index 11bd362a0d5..c2c2c3f3c11 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -202,10 +202,6 @@ static int bloblist_test_checksum(struct unit_test_state *uts) ut_asserteq(-EFBIG, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE)); hdr->size++;
- hdr->spare++; - ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE)); - hdr->spare--; - hdr->chksum++; ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE)); hdr->chksum--;