From 9cb528de4800f350e819000d93bfe836042528a2 Mon Sep 17 00:00:00 2001 From: Jagan Teki <jteki@openedev.com> Date: Mon, 29 Jun 2015 22:36:18 +0530 Subject: [PATCH] defconfig: Move CONFIG_SPI_FLASH_BAR from configs This commit moves: - CONFIG_SPI_FLASH_BAR from include/configs/*.h into configs/*_defconfigs Signed-off-by: Jagan Teki <jteki@openedev.com> --- configs/alt_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/lager_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mx6sxsabresd_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + include/configs/alt.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/bg0900.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - 22 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/alt_defconfig b/configs/alt_defconfig index f4fea7f2c3..d994d78592 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -17,4 +17,5 @@ CONFIG_TARGET_ALT=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SH_SDHI=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 407d67c476..65efa9d9a3 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -5,4 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 8e0fac8526..a29ad01bd4 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -4,3 +4,4 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 1a0e01fe9a..463a7e264e 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index bece0aa6a3..72aee1cd9c 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -17,4 +17,5 @@ CONFIG_TARGET_GOSE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SH_SDHI=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 13c8310b26..df49a71b96 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -17,4 +17,5 @@ CONFIG_TARGET_KOELSCH=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SH_SDHI=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 3805fcb5ce..6b86f00eaa 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -17,4 +17,5 @@ CONFIG_TARGET_LAGER=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SH_SDHI=y diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index c5b3b67024..b0b0d6c72c 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index e355ba5108..e6e4db5c48 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,M # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 15f3434de8..dc8b5caaf1 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -17,4 +17,5 @@ CONFIG_TARGET_PORTER=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SH_SDHI=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 20c85fd6e6..e4e4ebc6d9 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -17,4 +17,5 @@ CONFIG_TARGET_SILK=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SH_SDHI=y 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/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 -- 2.39.5