From 5d3b95bbaccb2453aeeaf6092e3a9f295c829271 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Tue, 11 Oct 2022 21:27:37 +1100 Subject: flashrom.c: Separate out default layout init get_default_layout() is undefined without a init_default_layout() so separate out that logic from probe_flash(). Change-Id: I8fd0af8fb1c32dc9f2b00cc39b518d2f4d98e3ac Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/68296 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- flashrom.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 088d8045..35758228 100644 --- a/flashrom.c +++ b/flashrom.c @@ -761,6 +761,17 @@ char *flashbuses_to_text(enum chipbustype bustype) return ret; } +static int init_default_layout(struct flashctx *flash) +{ + /* Fill default layout covering the whole chip. */ + if (flashrom_layout_new(&flash->default_layout) || + flashrom_layout_add_region(flash->default_layout, + 0, flash->chip->total_size * 1024 - 1, "complete flash") || + flashrom_layout_include_region(flash->default_layout, "complete flash")) + return -1; + return 0; +} + int probe_flash(struct registered_master *mst, int startchip, struct flashctx *flash, int force) { const struct flashchip *chip; @@ -849,12 +860,8 @@ notfound: if (!flash->chip) return -1; - /* Fill default layout covering the whole chip. */ - if (flashrom_layout_new(&flash->default_layout) || - flashrom_layout_add_region(flash->default_layout, - 0, flash->chip->total_size * 1024 - 1, "complete flash") || - flashrom_layout_include_region(flash->default_layout, "complete flash")) - return -1; + if (init_default_layout(flash) < 0) + return -1; tmp = flashbuses_to_text(flash->chip->bustype); msg_cinfo("%s %s flash chip \"%s\" (%d kB, %s) ", force ? "Assuming" : "Found", -- cgit v1.2.3