diff options
| author | Maximilian Brune <maximilian.brune@9elements.com> | 2023-11-13 02:07:01 +0100 |
|---|---|---|
| committer | Matt DeVillier <matt.devillier@amd.corp-partner.google.com> | 2023-11-16 23:09:11 +0000 |
| commit | 794d1d7f6cb1092e52e24f132baf00d034591ea7 (patch) | |
| tree | 2e2508d3d9baf8fcea1a82e9939e6148db5e0ffe | |
| parent | d3870a276114978660cf195e135b63c80e2e0ec0 (diff) | |
util/ifdtool/ifdtool.c: Add NULL check for fmapname
Some boards (e.g. prodrive/hermes) that do not provide their own FMAP
and therefore have been generated by the build system (+ ifdtool)
experience a failure when trying to build with an IFD that contains
regions which do not have equivalent fmap names (set to NULL).
Therefore add a NULL check for the fmapname and ignore the region if we
do not have an fmapname.
Test: compile prodrive/hermes
Signed-off-by: Maximilian Brune <maximilian.brune@9elements.com>
Change-Id: Ib4589b7fdbd11d644214ca5601536e9aeb26882f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79010
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
| -rw-r--r-- | util/ifdtool/ifdtool.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index ddbc0fb91b..43451b165f 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -1068,6 +1068,14 @@ static void create_fmap_template(char *image, int size, const char *layout_fname if (region.limit == 0 || region.base == 0x07FFF000) continue; + /* Is there an FMAP equivalent? IFD reserved regions are usually thrown out + * of the FMAP here + */ + if (!region_names[region.type].fmapname) { + printf("Skip IFD region: %s\n", region_names[region.type].pretty); + continue; + } + /* Here we decide to use the coreboot generated FMAP BIOS region, instead of * the one specified in the IFD. The case when IFD and FMAP BIOS region do not * match cannot be caught here, therefore one should still validate IFD and |