David Hendricks merged this change.
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 <ms@dev.tdt.de>
Reviewed-on: https://review.coreboot.org/22685
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M flashrom.c
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flashrom.c b/flashrom.c
index 4fe1843..12d7390 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1224,7 +1224,7 @@
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.
To view, visit change 22685. To unsubscribe, visit settings.