diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-24 16:24:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-24 16:24:50 -0400 |
| commit | f9b65c76b4828efbf8093c6b02bee5af0045b98b (patch) | |
| tree | 1429cb8e3cdfea42b63778ddf06ad0b33fb7bcf0 /fs/cbfs/cbfs.c | |
| parent | a9aa4c5700c68c070d63a391b51ea8d341b6e8a6 (diff) | |
| parent | 44e02e39a91cd91aae5a28d90259d3a6996010bf (diff) | |
| download | u-boot-f9b65c76b4828efbf8093c6b02bee5af0045b98b.tar.gz | |
Merge tag 'dm-pull-24jul19-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
Minor driver-model fixes and tweaks
A few device-tree fixes
Binman support for extracting files from an image
Diffstat (limited to 'fs/cbfs/cbfs.c')
| -rw-r--r-- | fs/cbfs/cbfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index 7b2513cb24..af4d3c5e56 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -55,7 +55,7 @@ static void swap_file_header(struct cbfs_fileheader *dest, memcpy(&dest->magic, &src->magic, sizeof(dest->magic)); dest->len = be32_to_cpu(src->len); dest->type = be32_to_cpu(src->type); - dest->checksum = be32_to_cpu(src->checksum); + dest->attributes_offset = be32_to_cpu(src->attributes_offset); dest->offset = be32_to_cpu(src->offset); } @@ -108,7 +108,7 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align, newNode->name = (char *)fileHeader + sizeof(struct cbfs_fileheader); newNode->name_length = name_len; - newNode->checksum = header.checksum; + newNode->attributes_offset = header.attributes_offset; step = header.len; if (step % align) |