diff options
| author | Nico Huber <nico.h@gmx.de> | 2019-06-16 19:46:46 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-06-26 15:54:51 +0000 |
| commit | c32c8dc8af9e971f91feaee145f1e8d6f114cad6 (patch) | |
| tree | 08094ba25f338f3ab83451edec8352333fdc9c5e /flashrom.c | |
| parent | f394fcec0da2fd4a9d1bd7a7911065344e67ce34 (diff) | |
| download | flashrom-c32c8dc8af9e971f91feaee145f1e8d6f114cad6.tar.gz flashrom-c32c8dc8af9e971f91feaee145f1e8d6f114cad6.tar.bz2 flashrom-c32c8dc8af9e971f91feaee145f1e8d6f114cad6.zip | |
layout: Introduce flashrom_layout_new()
It initializes an empty layout. Currently the maximum number of entries
has to be specified, which will vanish once we use dynamic allocation
per entry.
We replace the two special cases `single_layout` and `ich_layout` with
dynamically allocated layouts. As a result, we have to take care to
release the `default_layout` in a flashctx once we are done with it.
Change-Id: I2ae7246493ff592e631cce924777925c7825e398
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33543
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'flashrom.c')
| -rw-r--r-- | flashrom.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/flashrom.c b/flashrom.c index ffba5c444..7c91fa14b 100644 --- a/flashrom.c +++ b/flashrom.c @@ -822,15 +822,12 @@ notfound: if (!flash->chip) return -1; - /* Fill fallback layout covering the whole chip. */ - struct single_layout *const fallback = &flash->fallback_layout; - fallback->base.entries = &fallback->entry; - fallback->base.capacity = 1; - fallback->base.num_entries = 0; - if (flashrom_layout_add_region(&fallback->base, + /* Fill default layout covering the whole chip. */ + if (flashrom_layout_new(&flash->default_layout, 1) || + flashrom_layout_add_region(flash->default_layout, 0, flash->chip->total_size * 1024 - 1, "complete flash") || - flashrom_layout_include_region(&fallback->base, "complete flash")) - return -1; + flashrom_layout_include_region(flash->default_layout, "complete flash")) + return -1; tmp = flashbuses_to_text(flash->chip->bustype); msg_cinfo("%s %s flash chip \"%s\" (%d kB, %s) ", force ? "Assuming" : "Found", |