[U-Boot] [PATCH 2/2] configs: fsl: Move SPI/SPI-FLASH configs to defconfig

[Peng Fan]

On Thu, Sep 22, 2016 at 01:32:12AM +0530, Jagan Teki wrote:
>From: Jagan Teki <jteki at openedev.com>
>
>Moved FSL_QSPI/SPI/SPI-FLASH configs from include/configs
>into respective used defconfigs.
>- CONFIG_FSL_QSPI
>- CONFIG_SPI_FLASH
>- CONFIG_SPI_FLASH_BAR
>- CONFIG_SPI_FLASH_STMICRO
>
>Cc: Stefano Babic <sbabic at denx.de>
>Cc: Peng Fan <peng.fan at nxp.com>
>Signed-off-by: Jagan Teki <jteki at openedev.com>

Reviewed-by: Peng Fan <peng.fan at nxp.com>

Thanks,
Peng.

>---
> configs/mx6sxsabreauto_defconfig  | 1 +
> configs/mx6ul_14x14_evk_defconfig | 4 ++++
> configs/mx6ul_9x9_evk_defconfig   | 4 ++++
> include/configs/mx6sxsabreauto.h  | 1 -
> include/configs/mx6ul_14x14_evk.h | 4 ----
> 5 files changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig
>index 41d46f6..e80bb4e 100644
>--- a/configs/mx6sxsabreauto_defconfig
>+++ b/configs/mx6sxsabreauto_defconfig
>@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4=y
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
>+CONFIG_FSL_QSPI=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_BAR=y
> CONFIG_SPI_FLASH_STMICRO=y
>diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
>index 9b4c4a4..a829a18 100644
>--- a/configs/mx6ul_14x14_evk_defconfig
>+++ b/configs/mx6ul_14x14_evk_defconfig
>@@ -32,4 +32,8 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
>+CONFIG_FSL_QSPI=y
>+CONFIG_SPI_FLASH=y
>+CONFIG_SPI_FLASH_BAR=y
>+CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_OF_LIBFDT=y
>diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig
>index e88a1dc..eaf3cfd 100644
>--- a/configs/mx6ul_9x9_evk_defconfig
>+++ b/configs/mx6ul_9x9_evk_defconfig
>@@ -32,4 +32,8 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
>+CONFIG_FSL_QSPI=y
>+CONFIG_SPI_FLASH=y
>+CONFIG_SPI_FLASH_BAR=y
>+CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_OF_LIBFDT=y
>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
>-- 
>2.7.4
>
>_______________________________________________
>U-Boot mailing list
>U-Boot at lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot

--