diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-26 23:17:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-26 23:17:21 -0400 |
| commit | 2b9b9cdd5f9ae1cbc786ba3c2255a51b3ea4a636 (patch) | |
| tree | 6dbe4a091a06ae0f488498c63819c8ef7bd4e02f /include/spi_flash.h | |
| parent | e7134b9714ed851095e8bcf8b66e65c6f870634e (diff) | |
| parent | abe66b1b5decf9cc2fb5daad42c9e870e5b99b67 (diff) | |
Merge branch '2019-03-25-master-imports'
- Convert various SPI related options to Kconfig
Diffstat (limited to 'include/spi_flash.h')
| -rw-r--r-- | include/spi_flash.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/spi_flash.h b/include/spi_flash.h index 7f691e8559..55b4721813 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -13,17 +13,18 @@ #include <linux/types.h> #include <linux/mtd/spi-nor.h> -#ifndef CONFIG_SF_DEFAULT_SPEED -# define CONFIG_SF_DEFAULT_SPEED 1000000 +/* by default ENV use the same parameters than SF command */ +#ifndef CONFIG_ENV_SPI_BUS +# define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS #endif -#ifndef CONFIG_SF_DEFAULT_MODE -# define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 +#ifndef CONFIG_ENV_SPI_CS +# define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS #endif -#ifndef CONFIG_SF_DEFAULT_CS -# define CONFIG_SF_DEFAULT_CS 0 +#ifndef CONFIG_ENV_SPI_MAX_HZ +# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif -#ifndef CONFIG_SF_DEFAULT_BUS -# define CONFIG_SF_DEFAULT_BUS 0 +#ifndef CONFIG_ENV_SPI_MODE +# define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #endif struct spi_slave; |