From e5fd1c9debb9a3c456c973265f2460df473d5a27 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Wed, 11 Feb 2015 19:13:22 -0800 Subject: spi: allow inclusion of Micronix and STM drivers in bootblock Bootblock does not allow using malloc, use statically allocated chip structures instead. BRANCH=storm BUG=chrome-os-partner:33489 TEST=both drivers compile when configured in, also booted whirlwind with an STM compatible SPI NOR flash. Change-Id: I154c33ce5fc278d594205d8b8e62a56edb4e177e Signed-off-by: Patrick Georgi Original-Commit-Id: eedbb959a595e0898e7a1dd551fc7c517a02f370 Original-Change-Id: I29b37107ac1d58a293f531f59ee76b3d8c4b3e7c Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/248992 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/9772 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/drivers/spi/macronix.c | 35 +++++++++++++++-------------------- src/drivers/spi/stmicro.c | 29 ++++++++++++----------------- 2 files changed, 27 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index 21eff39ccc..1cee1bfd84 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -212,10 +212,11 @@ static int macronix_write(struct spi_flash *flash, return ret; } +static struct macronix_spi_flash mcx; + struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode) { const struct macronix_spi_flash_params *params; - struct macronix_spi_flash *mcx; unsigned int i; u16 id = idcode[2] | idcode[1] << 8; @@ -230,29 +231,23 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode) return NULL; } - mcx = malloc(sizeof(*mcx)); - if (!mcx) { - printk(BIOS_WARNING, "SF: Failed to allocate memory\n"); - return NULL; - } - - mcx->params = params; - mcx->flash.spi = spi; - mcx->flash.name = params->name; + mcx.params = params; + mcx.flash.spi = spi; + mcx.flash.name = params->name; - mcx->flash.write = macronix_write; - mcx->flash.erase = spi_flash_cmd_erase; - mcx->flash.status = spi_flash_cmd_status; + mcx.flash.write = macronix_write; + mcx.flash.erase = spi_flash_cmd_erase; + mcx.flash.status = spi_flash_cmd_status; #if CONFIG_SPI_FLASH_NO_FAST_READ - mcx->flash.read = spi_flash_cmd_read_slow; + mcx.flash.read = spi_flash_cmd_read_slow; #else - mcx->flash.read = spi_flash_cmd_read_fast; + mcx.flash.read = spi_flash_cmd_read_fast; #endif - mcx->flash.sector_size = params->page_size * params->pages_per_sector; - mcx->flash.size = mcx->flash.sector_size * params->sectors_per_block * + mcx.flash.sector_size = params->page_size * params->pages_per_sector; + mcx.flash.size = mcx.flash.sector_size * params->sectors_per_block * params->nr_blocks; - mcx->flash.erase_cmd = CMD_MX25XX_SE; - mcx->flash.status_cmd = CMD_MX25XX_RDSR; + mcx.flash.erase_cmd = CMD_MX25XX_SE; + mcx.flash.status_cmd = CMD_MX25XX_RDSR; - return &mcx->flash; + return &mcx.flash; } diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index 4df02b11a9..c959edab35 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -221,10 +221,11 @@ out: return ret; } +static struct stmicro_spi_flash stm; + struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) { const struct stmicro_spi_flash_params *params; - struct stmicro_spi_flash *stm; unsigned int i; if (idcode[0] == 0xff) { @@ -257,22 +258,16 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) return NULL; } - stm = malloc(sizeof(struct stmicro_spi_flash)); - if (!stm) { - printk(BIOS_WARNING, "SF: Failed to allocate memory\n"); - return NULL; - } - - stm->params = params; - stm->flash.spi = spi; - stm->flash.name = params->name; + stm.params = params; + stm.flash.spi = spi; + stm.flash.name = params->name; - stm->flash.write = stmicro_write; - stm->flash.erase = spi_flash_cmd_erase; - stm->flash.read = spi_flash_cmd_read_fast; - stm->flash.sector_size = params->page_size * params->pages_per_sector; - stm->flash.size = stm->flash.sector_size * params->nr_sectors; - stm->flash.erase_cmd = params->op_erase; + stm.flash.write = stmicro_write; + stm.flash.erase = spi_flash_cmd_erase; + stm.flash.read = spi_flash_cmd_read_fast; + stm.flash.sector_size = params->page_size * params->pages_per_sector; + stm.flash.size = stm.flash.sector_size * params->nr_sectors; + stm.flash.erase_cmd = params->op_erase; - return &stm->flash; + return &stm.flash; } -- cgit v1.2.3