diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-22 11:36:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-22 11:36:45 -0400 |
| commit | 19d051a2b78b626ea3f8103a9a08e73508ba9fa6 (patch) | |
| tree | bef8b4aa02b9a2375a611778aa8460ac2235750b /include/configs | |
| parent | 58c8c0963b1c720802c46ac4288c897e5f9cd296 (diff) | |
| parent | fe4753cbc6c51f712024121aad0d21293d6a85fc (diff) | |
| download | u-boot-imx-19d051a2b78b626ea3f8103a9a08e73508ba9fa6.zip u-boot-imx-19d051a2b78b626ea3f8103a9a08e73508ba9fa6.tar.gz u-boot-imx-19d051a2b78b626ea3f8103a9a08e73508ba9fa6.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 1 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 274cb36..c30e3dd 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -173,7 +173,6 @@ #define CONFIG_IMX_THERMAL -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_AHB #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 823405f..925a418 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -186,15 +186,11 @@ #ifndef CONFIG_SYS_DCACHE_OFF #endif -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_SPI_FLASH_STMICRO #define FSL_QSPI_FLASH_NUM 1 #define FSL_QSPI_FLASH_SIZE SZ_32M #endif |