[flashrom] [commit] r964 - trunk

[repository service]

Author: hailfinger
Date: Mon Mar 22 04:30:58 2010
New Revision: 964
URL: http://flashrom.org/trac/coreboot/changeset/964

Log:
Multibyte SPI write for the Bus Pirate.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Sean Nelson <audiohacked at gmail.com>

Modified:
   trunk/buspirate_spi.c
   trunk/flash.h
   trunk/spi.c

Modified: trunk/buspirate_spi.c
==============================================================================
--- trunk/buspirate_spi.c	Sun Mar 21 15:54:57 2010	(r963)
+++ trunk/buspirate_spi.c	Mon Mar 22 04:30:58 2010	(r964)
@@ -316,4 +316,39 @@
 	return spi_read_chunked(flash, buf, start, len, 12);
 }
 
-/* We could do 12-byte writes, but for now we use the generic 1-byte code. */
+int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf)
+{
+	int total_size = 1024 * flash->total_size;
+	int i;
+
+	spi_disable_blockprotect();
+	/* Erase first. */
+	msg_pinfo("Erasing flash before programming... ");
+	if (erase_flash(flash)) {
+		msg_perr("ERASE FAILED!\n");
+		return -1;
+	}
+	msg_pinfo("done.\n");
+
+	/* FIXME: We could do 12 byte writes, but then we'd have to make sure
+	 * not to cross a 256 byte page boundary. This problem only applies to
+	 * writes, reads can cross page boundaries just fine.
+	 */
+	for (i = 0; i < total_size; i += 8) {
+		int l, r;
+		if (i + 8 <= total_size)
+			l = 8;
+		else
+			l = total_size - i;
+
+		if ((r = spi_nbyte_program(i, &buf[i], l))) {
+			msg_perr("%s: write fail %d\n", __func__, r);
+			return 1;
+		}
+
+		while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP)
+			/* loop */;
+	}
+
+	return 0;
+}

Modified: trunk/flash.h
==============================================================================
--- trunk/flash.h	Sun Mar 21 15:54:57 2010	(r963)
+++ trunk/flash.h	Mon Mar 22 04:30:58 2010	(r964)
@@ -504,6 +504,7 @@
 int buspirate_spi_shutdown(void);
 int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);
 int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
+int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf);
 
 /* dediprog.c */
 int dediprog_init(void);

Modified: trunk/spi.c
==============================================================================
--- trunk/spi.c	Sun Mar 21 15:54:57 2010	(r963)
+++ trunk/spi.c	Mon Mar 22 04:30:58 2010	(r964)
@@ -108,7 +108,7 @@
 		.command = buspirate_spi_send_command,
 		.multicommand = default_spi_send_multicommand,
 		.read = buspirate_spi_read,
-		.write_256 = spi_chip_write_1,
+		.write_256 = buspirate_spi_write_256,
 	},
 #endif