| Message ID | 1562664015-30199-1-git-send-email-Ashish.Kumar@nxp.com |
|---|---|
| State | Accepted |
| Commit | bc475d0fde85ed524943d686b326f4dca8c5efcf |
| Delegated to: | Prabhakar Kushwaha |
| Headers | show |
| Series | [U-Boot] configs: ls1043aqds: Move CONFIG_FSL_QSPI to defconfig | expand |
> -----Original Message----- > From: Ashish Kumar <Ashish.Kumar@nxp.com> > Sent: Tuesday, July 9, 2019 2:50 PM > To: u-boot@lists.denx.de > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; Ashish Kumar > <ashish.kumar@nxp.com> > Subject: [PATCH] configs: ls1043aqds: Move CONFIG_FSL_QSPI to defconfig > > Move CONFIG_FSL_QSPI from header file to defconfigs, consequently unset > imply config(CONFIG_SPI_FLASH_BAR) which is not valid LS series > > Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> > --- This patch has been applied to fsl-qoriq master, awaiting upstream. --pk
diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig index ff37969..cc99877 100644 --- a/configs/ls1043aqds_qspi_defconfig +++ b/configs/ls1043aqds_qspi_defconfig @@ -35,6 +35,7 @@ CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_BAR is not set CONFIG_PHYLIB=y CONFIG_E1000=y CONFIG_FMAN_ENET=y @@ -47,6 +48,7 @@ CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig index 3f5af93..ecd3023 100644 --- a/configs/ls1043aqds_sdcard_qspi_defconfig +++ b/configs/ls1043aqds_sdcard_qspi_defconfig @@ -49,6 +49,7 @@ CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_BAR is not set CONFIG_PHYLIB=y CONFIG_E1000=y CONFIG_FMAN_ENET=y @@ -61,6 +62,7 @@ CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig index 19529f5..13f2ee6 100644 --- a/configs/ls1043aqds_tfa_defconfig +++ b/configs/ls1043aqds_tfa_defconfig @@ -47,6 +47,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1 +# CONFIG_SPI_FLASH_BAR is not set CONFIG_PHYLIB=y CONFIG_E1000=y CONFIG_FMAN_ENET=y @@ -58,6 +59,7 @@ CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 0e4e370..0ea3ca0 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -382,7 +382,6 @@ unsigned long get_board_ddr_clk(void); /* QSPI device */ #if defined(CONFIG_TFABOOT) || \ (defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)) -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_SPI_FLASH_SPANSION #define FSL_QSPI_FLASH_SIZE (1 << 24)
Move CONFIG_FSL_QSPI from header file to defconfigs, consequently unset imply config(CONFIG_SPI_FLASH_BAR) which is not valid LS series Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> --- configs/ls1043aqds_qspi_defconfig | 2 ++ configs/ls1043aqds_sdcard_qspi_defconfig | 2 ++ configs/ls1043aqds_tfa_defconfig | 2 ++ include/configs/ls1043aqds.h | 1 - 4 files changed, 6 insertions(+), 1 deletion(-)