arm: layerscape: Don't select FSL_IFC when booting from SD card

FSL_IFC should only be selected when booting from NAND flash (or when
NAND_FSL_IFC is enabled). The existing logic does this correctly when
QSPI is also enabled, but not when just booting from SD.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 8a7bbb4a655944d4bba6302a0ba69a3fd2e9ea50..ebca11d17419106d64b79ce02ee1d810b3308cc6 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -63,7 +63,7 @@ config ARCH_LS1043A
        bool
        select ARMV8_SET_SMPEN
        select ARM_ERRATA_855873 if !TFABOOT
-       select FSL_IFC if TFABOOT || (!QSPI_BOOT && !SD_BOOT_QSPI)
+       select FSL_IFC if TFABOOT || (!QSPI_BOOT && !SD_BOOT_QSPI && !SD_BOOT)
        select FSL_LAYERSCAPE
        select FSL_LSCH2
        select GICV2
@@ -100,7 +100,7 @@ config ARCH_LS1043A
 config ARCH_LS1046A
        bool
        select ARMV8_SET_SMPEN
-       select FSL_IFC if TFABOOT || (!QSPI_BOOT && !SD_BOOT_QSPI)
+       select FSL_IFC if TFABOOT || (!QSPI_BOOT && !SD_BOOT_QSPI && !SD_BOOT)
        select FSL_LAYERSCAPE
        select FSL_LSCH2
        select GICV2