On 07/23/15 17:19, Nikita Kiryanov wrote:
Add kconfig options for various SPI flashes and use them in cm-fx6 defconfig.
Cc: Jagan Teki jteki@openedev.com Cc: Stefano Babic sbabic@denx.de Cc: Igor Grinberg grinberg@compulab.co.il Signed-off-by: Nikita Kiryanov nikita@compulab.co.il
Acked-by: Igor Grinberg grinberg@compulab.co.il
configs/cm_fx6_defconfig | 8 ++++++++ drivers/mtd/spi/Kconfig | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/configs/cm_fx6.h | 8 -------- 3 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index f0fd48c..2aba359 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -13,6 +13,14 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_USB=y diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 4f0c040..8b730ff 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -42,6 +42,50 @@ config SPI_FLASH_BAR Bank/Extended address registers are used to access the flash which has size > 16MiB in 3-byte addressing.
+if SPI_FLASH
+config SPI_FLASH_ATMEL
- bool "Atmel SPI flash support"
- help
Add support for various Atmel SPI flash chips (AT45xxx and AT25xxx)+config SPI_FLASH_EON
- bool "EON SPI flash support"
- help
Add support for various EON SPI flash chips (EN25xxx)+config SPI_FLASH_GIGADEVICE
- bool "GigaDevice SPI flash support"
- help
Add support for various GigaDevice SPI flash chips (GD25xxx)+config SPI_FLASH_MACRONIX
- bool "Macronix SPI flash support"
- help
Add support for various Macronix SPI flash chips (MX25Lxxx)+config SPI_FLASH_SPANSION
- bool "Spansion SPI flash support"
- help
Add support for various Spansion SPI flash chips (S25FLxxx)+config SPI_FLASH_STMICRO
- bool "STMicro SPI flash support"
- help
Add support for various STMicro SPI flash chips (M25Pxxx and N25Qxxx)+config SPI_FLASH_SST
- bool "SST SPI flash support"
- help
Add support for various SST SPI flash chips (SST25xxx)+config SPI_FLASH_WINBOND
- bool "Winbond SPI flash support"
- help
Add support for various Winbond SPI flash chips (W25xxx)+endif
config SPI_FLASH_DATAFLASH bool "AT45xxx DataFlash support" depends on SPI_FLASH && DM_SPI_FLASH diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 059004c..bbd9f38 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -162,14 +162,6 @@ /* SPI */ #define CONFIG_SPI #define CONFIG_MXC_SPI -#define CONFIG_SPI_FLASH_ATMEL -#define CONFIG_SPI_FLASH_EON -#define CONFIG_SPI_FLASH_GIGADEVICE -#define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_WINBOND
/* NAND */ #ifndef CONFIG_SPL_BUILD