Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/33519 )
Change subject: layout: Introduce get_default_layout() ......................................................................
layout: Introduce get_default_layout()
Containing an included, full-flash-chip sized default region. This allows us to query the default layout specifically, also if an additional layout is attached to the flash context.
Change-Id: Ia343e9775ec5bdc3fea5cdb6b347298515996e34 Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/flashrom/+/33519 Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Anastasia Klimchuk aklm@chromium.org Reviewed-by: Peter Marheine pmarheine@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M layout.c M layout.h 2 files changed, 8 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved
diff --git a/layout.c b/layout.c index ede476a..11df15c 100644 --- a/layout.c +++ b/layout.c @@ -33,12 +33,17 @@ return &global_layout; }
+const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *const flashctx) +{ + return flashctx->default_layout; +} + const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx) { if (flashctx->layout && flashctx->layout->num_entries) return flashctx->layout; else - return flashctx->default_layout; + return get_default_layout(flashctx); }
static struct romentry *mutable_layout_next( diff --git a/layout.h b/layout.h index c05d1e7..49c1a13 100644 --- a/layout.h +++ b/layout.h @@ -58,8 +58,9 @@ struct layout_include_args *next; };
-struct flashrom_layout *get_global_layout(void); struct flashrom_flashctx; +struct flashrom_layout *get_global_layout(void); +const struct flashrom_layout *get_default_layout(const struct flashrom_flashctx *); const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx);
int get_region_range(struct flashrom_layout *const l, const char *name,