David Hendricks has submitted this change and it was merged. ( https://review.coreboot.org/22685 )
Change subject: Do not stop probing for flashchips after map_flash() failed
......................................................................
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(a)dev.tdt.de>
Reviewed-on: https://review.coreboot.org/22685
Reviewed-by: David Hendricks <david.hendricks(a)gmail.com>
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M flashrom.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
David Hendricks: Looks good to me, but someone else must approve
Nico Huber: Looks good to me, approved
build bot (Jenkins): Verified
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 https://review.coreboot.org/22685
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9
Gerrit-Change-Number: 22685
Gerrit-PatchSet: 3
Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Hello Stefan Tauner, Paul Menzel, build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/22685
to look at the new patch set (#2).
Change subject: Do not stop probing for flashchips after map_flash() failed
......................................................................
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(a)dev.tdt.de>
---
M flashrom.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/85/22685/2
--
To view, visit https://review.coreboot.org/22685
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9
Gerrit-Change-Number: 22685
Gerrit-PatchSet: 2
Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>