From d2d844233f1e0c937b12d5d777b767d1be24d840 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Wed, 13 Oct 2010 22:26:56 +0000 Subject: Switch all flash chips to partial write. The inner write functions which handle partial write are renamed to the original name of their wrappers. The write wrappers are removed. Signed-off-by: Carl-Daniel Hailfinger Tested-by: Maciej Pijanka Tested-by: Andrew Morgan Tested-by: Idwer Vollering Acked-by: Idwer Vollering Tested-by: Sean Nelson Acked-by: Sean Nelson git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1211 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- spi.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'spi.c') diff --git a/spi.c b/spi.c index 85607e7..1fc72d4 100644 --- a/spi.c +++ b/spi.c @@ -80,7 +80,7 @@ const struct spi_programmer spi_programmer[] = { .command = wbsio_spi_send_command, .multicommand = default_spi_send_multicommand, .read = wbsio_spi_read, - .write_256 = spi_chip_write_1_new, + .write_256 = spi_chip_write_1, }, { /* SPI_CONTROLLER_MCP6X_BITBANG */ @@ -124,7 +124,7 @@ const struct spi_programmer spi_programmer[] = { .command = dediprog_spi_send_command, .multicommand = default_spi_send_multicommand, .read = dediprog_spi_read, - .write_256 = spi_chip_write_1_new, + .write_256 = spi_chip_write_1, }, #endif @@ -245,7 +245,7 @@ int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len) * .write_256 = spi_chip_write_1 */ /* real chunksize is up to 256, logical chunksize is 256 */ -int spi_chip_write_256_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) { if (!spi_programmer[spi_controller].write_256) { msg_perr("%s called, but SPI page write is unsupported on this " @@ -257,20 +257,6 @@ int spi_chip_write_256_new(struct flashchip *flash, uint8_t *buf, int start, int return spi_programmer[spi_controller].write_256(flash, buf, start, len); } -/* Wrapper function until the generic code is converted to partial writes. */ -int spi_chip_write_256(struct flashchip *flash, uint8_t *buf) -{ - int ret; - - msg_pinfo("Programming flash... "); - ret = spi_chip_write_256_new(flash, buf, 0, flash->total_size * 1024); - if (!ret) - msg_pinfo("done.\n"); - else - msg_pinfo("\n"); - return ret; -} - /* * Get the lowest allowed address for read accesses. This often happens to * be the lowest allowed address for all commands which take an address. -- cgit v1.2.1