summaryrefslogtreecommitdiffstats
path: root/layout.c
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2019-06-16 03:22:58 +0200
committerNico Huber <nico.h@gmx.de>2021-06-26 15:55:39 +0000
commita630a564135f6fd7a7e14f0e002fb02df7d8d66f (patch)
treea2dd07fe8897b207737a755a46c99ba4085d1468 /layout.c
parentc32c8dc8af9e971f91feaee145f1e8d6f114cad6 (diff)
downloadflashrom-a630a564135f6fd7a7e14f0e002fb02df7d8d66f.tar.gz
flashrom-a630a564135f6fd7a7e14f0e002fb02df7d8d66f.tar.bz2
flashrom-a630a564135f6fd7a7e14f0e002fb02df7d8d66f.zip
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>
Diffstat (limited to 'layout.c')
-rw-r--r--layout.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/layout.c b/layout.c
index ede476ac4..11df15cf8 100644
--- a/layout.c
+++ b/layout.c
@@ -33,12 +33,17 @@ struct flashrom_layout *get_global_layout(void)
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(