dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 02:02:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

spi: Move DM_SPI_FLASH and SPI_FLASH_DATAFLASH to Kconfig (for ls1021aXXX)

Browse Source 
This patch moves the CONFIG_DM_SPI_FLASH and CONFIG_SPI_FLASH_DATAFLASH
to be defined in Kconfig, not in board specific header file
(include/configs/<board>.h).

Before this change the CONFIG_DM_SPI_FLASH was not set in .config (so it
was not possible to use CONFIG_IS_ENABLED(DM_SPI_FLASH) in SPI DM/DTS
converted drivers), but it was set in u-boot.cfg file.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
This commit is contained in:
Lukasz Majewski
2020-06-04 23:11:52 +08:00
committed by Tom Rini
parent 044a66cb83
commit 2896422706
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/Kconfig
View File

@@ -1456,6 +1456,8 @@ config TARGET_LS1021AQDS
select SUPPORT_SPL select SUPPORT_SPL
select SYS_FSL_DDR select SYS_FSL_DDR
select FSL_DDR_INTERACTIVE select FSL_DDR_INTERACTIVE
select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
select SPI_FLASH_DATAFLASH if FSL_DSPI || FSL_QSPI
imply SCSI imply SCSI
config TARGET_LS1021ATWR config TARGET_LS1021ATWR
@@ -1469,6 +1471,7 @@ config TARGET_LS1021ATWR
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select LS1_DEEP_SLEEP select LS1_DEEP_SLEEP
select SUPPORT_SPL select SUPPORT_SPL
select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
imply SCSI imply SCSI
config TARGET_LS1021ATSN config TARGET_LS1021ATSN
@@ -1493,6 +1496,7 @@ config TARGET_LS1021AIOT
select CPU_V7_HAS_NONSEC select CPU_V7_HAS_NONSEC
select CPU_V7_HAS_VIRT select CPU_V7_HAS_VIRT
select SUPPORT_SPL select SUPPORT_SPL
select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
imply SCSI imply SCSI
help help
Support for Freescale LS1021AIOT platform. Support for Freescale LS1021AIOT platform.
@@ -1945,5 +1949,3 @@ config SPL_LDSCRIPT
default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64

5
include/configs/ls1021aiot.h
View File

@@ -138,11 +138,6 @@
#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_SPANSION
#endif #endif
/* DM SPI */
#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
#define CONFIG_DM_SPI_FLASH
#endif
/* /*
* eTSEC * eTSEC
*/ */

5
include/configs/ls1021aqds.h
View File

@@ -363,11 +363,6 @@ unsigned long get_board_ddr_clk(void);
* MMC * MMC
*/ */
/* DM SPI */
#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
#define CONFIG_DM_SPI_FLASH
#endif
/* /*
* Video * Video
*/ */

5
include/configs/ls1021atwr.h
View File

@@ -234,11 +234,6 @@
* MMC * MMC
*/ */
/* DM SPI */
#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
#define CONFIG_DM_SPI_FLASH
#endif
/* /*
* Video * Video
*/ */