diff options
| author | Tom Rini <trini@ti.com> | 2013-10-08 09:03:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-08 09:03:15 -0400 |
| commit | 968294bd7b9b540f53c1fb3c809da464623a4362 (patch) | |
| tree | 141a04ec65894787e2d7c4eda808ef700b81101f /include/configs | |
| parent | b770e88a6c2548727f0d57a3e9e8bb0830f977b5 (diff) | |
| parent | c4a796329d00ce46de6b5afeb1fdabec82830677 (diff) | |
| download | u-boot-imx-968294bd7b9b540f53c1fb3c809da464623a4362.zip u-boot-imx-968294bd7b9b540f53c1fb3c809da464623a4362.tar.gz u-boot-imx-968294bd7b9b540f53c1fb3c809da464623a4362.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/dra7xx_evm.h | 19 | ||||
| -rw-r--r-- | include/configs/top9000.h | 1 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7b120de..51e0e80 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -48,4 +48,23 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_ADDR 2 +/* SPI */ +#undef CONFIG_OMAP3_SPI +#define CONFIG_TI_QSPI +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_TI_SPI_MMAP +#define CONFIG_SF_DEFAULT_SPEED 48000000 +#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 + +/* SPI SPL */ +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_SPI_LOAD +#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_BUS 0 +#define CONFIG_SPL_SPI_CS 0 +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 + #endif /* __CONFIG_DRA7XX_EVM_H */ diff --git a/include/configs/top9000.h b/include/configs/top9000.h index 65dabde..a6d6928 100644 --- a/include/configs/top9000.h +++ b/include/configs/top9000.h @@ -120,7 +120,6 @@ #define CONFIG_ATMEL_SPI0 /* SPI used for FRAM is SPI0 */ #define FRAM_SPI_BUS 0 #define FRAM_CS_NUM 0 -#define CONFIG_SPI_FLASH /* RAMTRON FRAM on SPI bus */ #define CONFIG_SPI_FRAM_RAMTRON #define CONFIG_SF_DEFAULT_SPEED 1000000 /* be conservative here... */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 |