sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: allow inclusion of Micronix and STM drivers in bootblock

Browse Source 
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 <pgeorgi@chromium.org>
Original-Commit-Id: eedbb959a595e0898e7a1dd551fc7c517a02f370
Original-Change-Id: I29b37107ac1d58a293f531f59ee76b3d8c4b3e7c
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/248992
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9772
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Vadim Bendebury
2015-02-11 19:13:22 -08:00
committed by Patrick Georgi
parent fc08b76ef5
commit e5fd1c9deb
2 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/drivers/spi/stmicro.c
View File

@ -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;
}