Add a bunch of new/tested stuff and various small changes 15
Tested Mainboards:
OK:
- Foxconn P55MX
http://www.flashrom.org/pipermail/flashrom/2012-October/010002.html
Tested flash chips:
- Eon EN25F64 to PR (+PR)
http://paste.flashrom.org/view.php?id=1426
- Macronix MX25L1005 to PREW (+PREW)
http://www.flashrom.org/pipermail/flashrom/2012-October/010004.html
- Set SST39VF512 to PREW (+W)
http://www.flashrom.org/pipermail/flashrom/2012-September/009958.html
Tested chipsets:
- Z77 (only reading was really tested)
Miscellaneous:
- Fix ft2232_spi's parameter parsing.
- Fix nicrealtek's init (always segfaulted since r1586 oops).
- Add another T60 variant to the laptop whitelist.
- Improve message shown when image file size does not match flash chip
- Refine messages regarding the flash descriptor override strap according
to the findings by Vladislav Bykov on his P55MX.
- Fix the ID of EN25F64.
- Demote and clarify debug message in serprog_delay().
- Minor other cleanups.
Corresponding to flashrom svn r1613.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
diff --git a/ichspi.c b/ichspi.c
index 8dd1893..fadfe62 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -1675,11 +1675,9 @@
if (tmp2 & HSFS_FDV)
desc_valid = 1;
if (!(tmp2 & HSFS_FDOPSS) && desc_valid)
- msg_pinfo("The Flash Descriptor Security Override "
- "Strap-Pin is set. Restrictions implied\n"
- "by the FRAP and FREG registers are NOT in "
- "effect. Please note that Protected\n"
- "Range (PR) restrictions still apply.\n");
+ msg_pinfo("The Flash Descriptor Override Strap-Pin is set. Restrictions implied by\n"
+ "the Master Section of the flash descriptor are NOT in effect. Please note\n"
+ "that Protected Range (PR) restrictions still apply.\n");
ich_init_opcodes();
if (desc_valid) {
@@ -1720,15 +1718,13 @@
"yet.\n");
if (!ich_spi_force)
programmer_may_write = 0;
- msg_pinfo("Writes have been disabled. You can enforce "
- "write support with the\nich_spi_force "
- "programmer option, but it will most likely "
- "harm your hardware!\nIf you force flashrom "
- "you will get no support if something "
- "breaks.\n");
+ msg_pinfo("Writes have been disabled for safety reasons. You can enforce write\n"
+ "support with the ich_spi_force programmer option, but you will most likely\n"
+ "harm your hardware! If you force flashrom you will get no support if\n"
+ "something breaks. On a few mainboards it is possible to enable write\n"
+ "access by setting a jumper (see its documentation or the board itself).\n");
if (ich_spi_force)
- msg_pinfo("Continuing with write support "
- "because the user forced us to!\n");
+ msg_pinfo("Continuing with write support because the user forced us to!\n");
}
tmp = mmio_readl(ich_spibar + ICH9_REG_SSFS);