openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 06:23:18 +02:00
Code Issues Releases Wiki Activity

layout: Introduce flashrom_layout_add_region()

Browse Source 
Adds a region to an existing layout, as long as there is space.

Change-Id: I50d473d0d5d1fb38bd6f9ae3d7127e9ea66a94e1
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33517
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber
2019-06-15 15:55:11 +02:00
parent 7ebd578100
commit f394fcec0d
5 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libflashrom.c
View File

@ -501,6 +501,8 @@ static int flashrom_layout_parse_fmap(struct flashrom_layout **layout,
struct flashctx *const flashctx, const struct fmap *const fmap)
{
int i;
char name[FMAP_STRLEN + 1];
const struct fmap_area *area;
struct flashrom_layout *l = get_global_layout();
if (!fmap || !l)
@ -511,21 +513,10 @@ static int flashrom_layout_parse_fmap(struct flashrom_layout **layout,
return 1;
}
for (i = 0; i < fmap->nareas; i++) {
l->entries[l->num_entries].start = fmap->areas[i].offset;
l->entries[l->num_entries].end = fmap->areas[i].offset + fmap->areas[i].size - 1;
l->entries[l->num_entries].included = false;
l->entries[l->num_entries].name =
strndup((const char *)fmap->areas[i].name, FMAP_STRLEN);
if (!l->entries[l->num_entries].name) {
msg_gerr("Error adding layout entry: %s\n", strerror(errno));
for (i = 0, area = fmap->areas; i < fmap->nareas; i++, area++) {
snprintf(name, sizeof(name), "%s", area->name);
if (flashrom_layout_add_region(l, area->offset, area->offset + area->size - 1, name))
return 1;
}
msg_gdbg("fmap %08x - %08x named %s\n",
l->entries[l->num_entries].start,
l->entries[l->num_entries].end,
l->entries[l->num_entries].name);
l->num_entries++;
}
*layout = l;