diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-01 15:38:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-01 15:38:12 -0400 |
| commit | 891b487098ee2169a16b1bbb354aaef28aa90630 (patch) | |
| tree | dac06e8de18355c574eaf47fe29d75873ce0fda6 /include/configs | |
| parent | 6762ae68887d962e1a4be193672005bdefd3ee32 (diff) | |
| parent | 8aa5f1d971df0f668144759991e19b5195606a32 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/alt.h | 1 | ||||
| -rw-r--r-- | include/configs/am43xx_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/bg0900.h | 1 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/gose.h | 1 | ||||
| -rw-r--r-- | include/configs/koelsch.h | 1 | ||||
| -rw-r--r-- | include/configs/lager.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1021aqds.h | 2 | ||||
| -rw-r--r-- | include/configs/maxbcm.h | 1 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 1 | ||||
| -rw-r--r-- | include/configs/porter.h | 1 | ||||
| -rw-r--r-- | include/configs/silk.h | 1 |
12 files changed, 1 insertions, 12 deletions
diff --git a/include/configs/alt.h b/include/configs/alt.h index 524da4280d..6d2c242b95 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -41,7 +41,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 466ded7ddf..33e534a765 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -204,7 +204,6 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_TI_SPI_MMAP -#define CONFIG_SPI_FLASH_BAR #define CONFIG_QSPI_SEL_GPIO 48 #define CONFIG_SF_DEFAULT_SPEED 48000000 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 76c1c6a094..c45c8c2389 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -49,7 +49,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 914e1cf069..d84427d1d8 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -125,7 +125,6 @@ #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_TI_SPI_MMAP #define CONFIG_SF_DEFAULT_SPEED 48000000 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 diff --git a/include/configs/gose.h b/include/configs/gose.h index f088649afd..c08e73ac69 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index ff948f963c..c905cc2dc2 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ diff --git a/include/configs/lager.h b/include/configs/lager.h index 546863ea48..1450e8f53f 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -42,7 +42,6 @@ /* SPI */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 46c609af89..8a5a707d3b 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -423,7 +423,7 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) #define CONFIG_CMD_SF #define CONFIG_DM_SPI_FLASH -#define CONFIG_SF_DATAFLASH +#define CONFIG_SPI_FLASH_DATAFLASH #endif #endif diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 0839d39a39..4826044857 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -43,7 +43,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_BAR /* Environment in SPI NOR flash */ #define CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 19f9e4438c..2b278a8ab4 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -189,7 +189,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SYS_FSL_QSPI_LE diff --git a/include/configs/porter.h b/include/configs/porter.h index 93673490fb..59b14e9061 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -42,7 +42,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD diff --git a/include/configs/silk.h b/include/configs/silk.h index b105f5af31..cd839aa63f 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -42,7 +42,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD |