1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00

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>
This commit is contained in:
Martin Schiller 2017-11-23 06:24:57 +01:00 committed by David Hendricks
parent 48729d31a6
commit 57a3b731da

View File

@ -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.