summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNikita Kiryanov <[email protected]>2014-08-20 15:08:48 +0300
committerJagannadha Sutradharudu Teki <[email protected]>2014-09-24 17:40:10 +0530
commit88e34e5ff76bffa7d56b1d04e0bd2627ee5b584d (patch)
tree21f57c987853c8946082e82a8ccd2907af0f207a /common
parent155fa9af95ac5be857a7327e7a968a296e60d4c8 (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 'common')
-rw-r--r--common/cmd_sf.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index b4ceb714663..c60e8d10df6 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -13,19 +13,6 @@
#include <asm/io.h>
-#ifndef CONFIG_SF_DEFAULT_SPEED
-# define CONFIG_SF_DEFAULT_SPEED 1000000
-#endif
-#ifndef CONFIG_SF_DEFAULT_MODE
-# define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
-#endif
-#ifndef CONFIG_SF_DEFAULT_CS
-# define CONFIG_SF_DEFAULT_CS 0
-#endif
-#ifndef CONFIG_SF_DEFAULT_BUS
-# define CONFIG_SF_DEFAULT_BUS 0
-#endif
-
static struct spi_flash *flash;