--- not sure if this is correct for all execution paths, but it fixes the output of a probe on my thinkpad. i have looked a bit around to find examples of code that this patch would break and found none though.
without this patch: Probing for Spansion S25FL064A, 8192 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 Probing for SST SST25LF040A, 512 kB: Invalid OPCODE 0xab, will not execute. Probing for SST SST25LF080A, 1024 kB: Invalid OPCODE 0xab, will not execute. Probing for SST SST25VF010.REMS, 128 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF016B, 2048 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 with this patch: Probing for Spansion S25FL064A, 8192 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 Probing for SST SST25LF040A, 512 kB: Invalid OPCODE 0xab, will not execute. Probing for SST SST25LF080A, 1024 kB: Invalid OPCODE 0xab, will not execute. Probing for SST SST25VF010.REMS, 128 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF016B, 2048 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 Signed-off-by: Stefan Tauner <[email protected]> --- spi25.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/spi25.c b/spi25.c index 937ee5d..c9fe9ec 100644 --- a/spi25.c +++ b/spi25.c @@ -120,7 +120,6 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) uint32_t id2; if (spi_rdid(readarr, bytes)) { - msg_cdbg("\n"); return 0; } @@ -201,7 +200,6 @@ int probe_spi_rems(struct flashchip *flash) uint32_t id1, id2; if (spi_rems(readarr)) { - msg_cdbg("\n"); return 0; } @@ -259,7 +257,6 @@ int probe_spi_res1(struct flashchip *flash) } if (spi_res(readarr, 1)) { - msg_cdbg("\n"); return 0; } @@ -283,7 +280,6 @@ int probe_spi_res2(struct flashchip *flash) uint32_t id1, id2; if (spi_res(readarr, 2)) { - msg_cdbg("\n"); return 0; } -- 1.7.1 _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
