-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Zhiqiang Hou Sent: Tuesday, June 2, 2020 6:41 PM To: u-boot@lists.denx.de; lokeshvutla@ti.com; afd@ti.com; hs@denx.de; sjg@chromium.org; feng.li_2@nxp.com; Alison Wang alison.wang@nxp.com; sumit.garg@nxp.com; eugen.hristev@microchip.com; patrick.delaunay@st.com; jagan@amarulasolutions.com; vigneshr@ti.com; joe.hershberger@ni.com; sr@denx.de; wd@denx.de; lukma@denx.de; miquel.raynal@bootlin.com; marex@denx.de; bmeng.cn@gmail.com; simon.k.r.goldschmidt@gmail.com; markus.klotzbuecher@kistler.com; baruch@tkos.co.il; hws@denx.de; mrjoel@lixil.net; agust@denx.de; Priyanka Jain priyanka.jain@nxp.com; Madalin Bucur (OSS) madalin.bucur@oss.nxp.com; Gervais, Francois FGervais@distech-controls.com; Udit Agarwal udit.agarwal@nxp.com Cc: Z.q. Hou zhiqiang.hou@nxp.com Subject: [PATCHv4 1/3] spi: Move DM_SPI_FLASH to Kconfig (for NXP's ls1043a)
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
V4:
- Rebase the patch, no change intended.
arch/arm/Kconfig | 4 ++++ include/configs/ls1043a_common.h | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21df1c415f..28b8e9354f 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 && !SPL_NO_DSPI
Since you have already added check for !SPL_NO_DSPI in previous statement, no need to add here.
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 && !SPL_NO_DSPI
Since you have already added check for !SPL_NO_DSPI in previous statement, no need to add here.
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 */
2.17.1
Thanks Priyanka