From bcc97415f2232389de1c1384b3f480769296f880 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Wed, 14 Jul 2010 19:57:52 +0000 Subject: Use the max_rom_decode infrastructure for wbsio_spi instead of open-coding a variant which only aborts after it is too late. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Michael Karcher git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1081 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- wbsio_spi.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'wbsio_spi.c') diff --git a/wbsio_spi.c b/wbsio_spi.c index 8db6524..b8f8b38 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -69,6 +69,9 @@ int wbsio_check_for_spi(void) buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_WBSIO; + msg_pdbg("%s: Winbond saved on 4 register bits so max chip size is " + "1024 KB!\n", __func__); + max_rom_decode.spi = 1024 * 1024; return 0; } @@ -179,24 +182,7 @@ int wbsio_spi_send_command(unsigned int writecnt, unsigned int readcnt, int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) { - int size = flash->total_size * 1024; - - if (size > 1024 * 1024) { - msg_perr("%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); - return 1; - } - return read_memmapped(flash, buf, start, len); } -int wbsio_spi_write_1(struct flashchip *flash, uint8_t *buf, int start, int len) -{ - if (flash->total_size * 1024 > 1024 * 1024) { - msg_perr("%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); - return 1; - } - - return spi_chip_write_1_new(flash, buf, start, len); -} - #endif -- cgit v1.2.1