diff mbox series

[PATCHv5,1/3] spi: Move DM_SPI_FLASH to Kconfig (for NXP's ls1043a)

Message ID 20200604151153.3980-2-Zhiqiang.Hou@nxp.com
State Accepted
Commit 044a66cb83a7cff9799a4b2b1815b604f1781dc0
Delegated to: Tom Rini
Headers show
Series spi: Split CONFIG_DM_SPI* to CONFIG_{SPL_TPL}DM_SPI* | expand

Commit Message

Z.q. Hou June 4, 2020, 3:11 p.m. UTC
From: Lukasz Majewski <lukma@denx.de>

This patch fixes issue with defining the DM_SPI_FLASH in the
configs/include/<board.h> instead of enabling this option in Kconfig.

The problem is that CONFIG_IS_ENABLED(DM_SPI_FLASH) shows false as there
is no DM_SPI_FLASH=y in .config (but the define is set in u-boot.cfg).

As a result conversion of DM_SPI_FLASH to using CONFIG_IS_ENABLED() is not
working properly.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
---
V5:
 - Remove the redundant condition check "!SPL_NO_DSPI" when selecting
   DM_SPI_FLASH.

 arch/arm/Kconfig                 | 4 ++++
 include/configs/ls1043a_common.h | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Tom Rini June 30, 2020, 3:16 p.m. UTC | #1
On Thu, Jun 04, 2020 at 11:11:51PM +0800, Zhiqiang Hou wrote:

> From: Lukasz Majewski <lukma@denx.de>
> 
> This patch fixes issue with defining the DM_SPI_FLASH in the
> configs/include/<board.h> instead of enabling this option in Kconfig.
> 
> The problem is that CONFIG_IS_ENABLED(DM_SPI_FLASH) shows false as there
> is no DM_SPI_FLASH=y in .config (but the define is set in u-boot.cfg).
> 
> As a result conversion of DM_SPI_FLASH to using CONFIG_IS_ENABLED() is not
> working properly.
> 
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 21df1c415f..5a9583d0cf 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1501,6 +1501,8 @@  config TARGET_LS1043AQDS
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select FSL_DDR_INTERACTIVE if !SPL
+	select FSL_DSPI if !SPL_NO_DSPI
+	select DM_SPI_FLASH if FSL_DSPI
 	imply SCSI
 	imply SCSI_AHCI
 	help
@@ -1515,6 +1517,8 @@  config TARGET_LS1043ARDB
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
+	select FSL_DSPI if !SPL_NO_DSPI
+	select DM_SPI_FLASH if FSL_DSPI
 	help
 	  Support for Freescale LS1043ARDB platform.
 
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 985f40412c..0857b15fe0 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -176,9 +176,7 @@ 
 
 /*  DSPI  */
 #ifndef SPL_NO_DSPI
-#define CONFIG_FSL_DSPI
 #ifdef CONFIG_FSL_DSPI
-#define CONFIG_DM_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO	/* cs0 */
 #define CONFIG_SPI_FLASH_SST		/* cs1 */
 #define CONFIG_SPI_FLASH_EON		/* cs2 */