diff options
| author | Nikita Kiryanov <[email protected]> | 2014-08-20 15:08:48 +0300 |
|---|---|---|
| committer | Jagannadha Sutradharudu Teki <[email protected]> | 2014-09-24 17:40:10 +0530 |
| commit | 88e34e5ff76bffa7d56b1d04e0bd2627ee5b584d (patch) | |
| tree | 21f57c987853c8946082e82a8ccd2907af0f207a /drivers | |
| parent | 155fa9af95ac5be857a7327e7a968a296e60d4c8 (diff) | |
spl: replace CONFIG_SPL_SPI_* with CONFIG_SF_DEFAULT_*
Currently, CONFIG_SPL_SPI_* #defines are used for controlling SPI boot in
SPL. These #defines do not allow the user to select SPI mode for the SPI flash
(there's no CONFIG_SPL_SPI_MODE, so the SPI mode is hardcoded in
spi_spl_load.c), and duplicate information already provided by
CONFIG_SF_DEFAULT_* #defines.
Kill CONFIG_SPL_SPI_*, and use CONFIG_SF_DEFAULT_* instead.
Cc: Tom Rini <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Sudhakar Rajashekhara <[email protected]>
Cc: Lokesh Vutla <[email protected]>
Cc: Vitaly Andrianov <[email protected]>
Cc: Lars Poeschel <[email protected]>
Cc: Bo Shen <[email protected]>
Cc: Hannes Petermaier <[email protected]>
Cc: Michal Simek <[email protected]>
Acked-by: Marek Vasut <[email protected]>
Signed-off-by: Nikita Kiryanov <[email protected]>
Reviewed-by: Jagannadha Sutradharudu Teki <[email protected]>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi/spi_spl_load.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c index 1954b7e8860..59cca0f4d99 100644 --- a/drivers/mtd/spi/spi_spl_load.c +++ b/drivers/mtd/spi/spi_spl_load.c @@ -56,8 +56,10 @@ void spl_spi_load_image(void) * Load U-Boot image from SPI flash into RAM */ - flash = spi_flash_probe(CONFIG_SPL_SPI_BUS, CONFIG_SPL_SPI_CS, - CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3); + flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, + CONFIG_SF_DEFAULT_CS, + CONFIG_SF_DEFAULT_SPEED, + CONFIG_SF_DEFAULT_MODE); if (!flash) { puts("SPI probe failed.\n"); hang(); |