openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

libflashrom: Avoid using the global layout

Browse Source 
We used to borrow the global layout from the CLI here. Create
a dynamically allocated one instead that doesn't need special
treatment.

Change-Id: Ic48c9e73a3d00782f638f6ff41b620910b24ab6f
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54284
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2021-05-14 00:39:24 +02:00
parent 73ae47ecc2
commit e03a5f7d5d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libflashrom.c
View File

@ -502,15 +502,17 @@ static int flashrom_layout_parse_fmap(struct flashrom_layout **layout,
int i; int i;
char name[FMAP_STRLEN + 1]; char name[FMAP_STRLEN + 1];
const struct fmap_area *area; const struct fmap_area *area;
struct flashrom_layout *l = get_global_layout(); struct flashrom_layout *l;
if (!fmap || !l) if (!fmap || flashrom_layout_new(&l))
return 1; return 1;
for (i = 0, area = fmap->areas; i < fmap->nareas; i++, area++) { for (i = 0, area = fmap->areas; i < fmap->nareas; i++, area++) {
snprintf(name, sizeof(name), "%s", area->name); snprintf(name, sizeof(name), "%s", area->name);
if (flashrom_layout_add_region(l, area->offset, area->offset + area->size - 1, name)) if (flashrom_layout_add_region(l, area->offset, area->offset + area->size - 1, name)) {
flashrom_layout_release(l);
return 1; return 1;
}
} }
*layout = l; *layout = l;