sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/cse_serger: Replace cse_layout_regions with array of regions

Browse Source 
This change replaces `struct cse_layout_regions` with an array of
`struct region` and introduces enums for DP and BP[1-4]. This makes it
easier to loop over the different regions in following changes.

BUG=b:189177186

Change-Id: If3cced4506d26dc534047cb9c385aaa9418d8522
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58214
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Furquan Shaikh
2021-10-09 23:06:09 -07:00
parent 5d8f4badda
commit 8b4ca15d7e
4 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util/cbfstool/bpdt_formats/bpdt_1_6.c
View File

@@ -142,21 +142,21 @@ static void inc_bpdt_entry_count(bpdt_hdr_ptr ptr)
h->descriptor_count++;
}
static cse_layout_ptr create_cse_layout(const struct cse_layout_regions *r)
static cse_layout_ptr create_cse_layout(const struct region *r)
{
struct cse_layout *l = malloc(sizeof(*l));
if (!l)
return NULL;
l->data_offset = r->data_partition.offset;
l->data_size = r->data_partition.size;
l->bp1_offset = r->bp1.offset;
l->bp1_size = r->bp1.size;
l->bp2_offset = r->bp2.offset;
l->bp2_size = r->bp2.size;
l->bp3_offset = r->bp3.offset;
l->bp3_size = r->bp3.size;
l->data_offset = r[DP].offset;
l->data_size = r[DP].size;
l->bp1_offset = r[BP1].offset;
l->bp1_size = r[BP1].size;
l->bp2_offset = r[BP2].offset;
l->bp2_size = r[BP2].size;
l->bp3_offset = r[BP3].offset;
l->bp3_size = r[BP3].size;
l->checksum = 0; /* unused */
return 0;

22
util/cbfstool/bpdt_formats/bpdt_1_7.c
View File

@@ -185,7 +185,7 @@ static uint32_t calculate_layout_checksum(struct cse_layout *l)
return calc_checksum;
}
static cse_layout_ptr create_cse_layout(const struct cse_layout_regions *r)
static cse_layout_ptr create_cse_layout(const struct region *r)
{
struct cse_layout *l = calloc(1, sizeof(*l));
@@ -196,16 +196,16 @@ static cse_layout_ptr create_cse_layout(const struct cse_layout_regions *r)
l->size = sizeof(struct cse_layout) - sizeof(l->rom_bypass);
l->redundancy = 0;
l->checksum = 0;
l->data_offset = r->data_partition.offset;
l->data_size = r->data_partition.size;
l->bp1_offset = r->bp1.offset;
l->bp1_size = r->bp1.size;
l->bp2_offset = r->bp2.offset;
l->bp2_size = r->bp2.size;
l->bp3_offset = r->bp3.offset;
l->bp3_size = r->bp3.size;
l->bp4_offset = r->bp4.offset;
l->bp4_size = r->bp4.size;
l->data_offset = r[DP].offset;
l->data_size = r[DP].size;
l->bp1_offset = r[BP1].offset;
l->bp1_size = r[BP1].size;
l->bp2_offset = r[BP2].offset;
l->bp2_size = r[BP2].size;
l->bp3_offset = r[BP3].offset;
l->bp3_size = r[BP3].size;
l->bp4_offset = r[BP4].offset;
l->bp4_size = r[BP4].size;
l->bp5_offset = 0;
l->bp5_size = 0;
l->temp_base_addr = 0;