From 57a3b731daa8f0a6ed9d193b1b9e03216b66a802 Mon Sep 17 00:00:00 2001 From: Martin Schiller Date: Thu, 23 Nov 2017 06:24:57 +0100 Subject: [PATCH] Do not stop probing for flashchips after map_flash() failed Instead, continue probing the next chip. This fixes the problem that flashrom aborts probing for flashchips if one big flashchip (e.g. 32M/64M) can't be mapped because of activated CONFIG_STRICT_DEVMEM kernel option. Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Signed-off-by: Martin Schiller Reviewed-on: https://review.coreboot.org/22685 Reviewed-by: David Hendricks Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- flashrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flashrom.c b/flashrom.c index 4fe184320..12d739014 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1224,7 +1224,7 @@ int probe_flash(struct registered_master *mst, int startchip, struct flashctx *f flash->mst = mst; if (map_flash(flash) != 0) - return -1; + goto notfound; /* We handle a forced match like a real match, we just avoid probing. Note that probe_flash() * is only called with force=1 after normal probing failed.