| Message ID | 20221011215106.4133222-2-sean.anderson@seco.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | arm64: layerscape: Various small size reductions for SPL | expand |
On 10/12/2022 5:51 AM, Sean Anderson wrote: > 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> Reviewed-by: Peng Fan <peng.fan@nxp.com> > --- > > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > index 80a1642447d..10eef84f8d9 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > @@ -62,7 +62,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 > @@ -98,7 +98,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
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 80a1642447d..10eef84f8d9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -62,7 +62,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 @@ -98,7 +98,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
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> --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)