armv8: fsl-lsch3: Make CCN-504 related code conditional

[platform/kernel/u-boot.git] / arch / arm / cpu / armv8 / fsl-layerscape / Kconfig

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 3e02132..d72f8f8 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -61,6 +61,7 @@ config ARCH_LS2080A
        select SYS_FSL_DDR
        select SYS_FSL_DDR_LE
        select SYS_FSL_DDR_VER_50
+       select SYS_FSL_HAS_CCN504
        select SYS_FSL_HAS_DP_DDR
        select SYS_FSL_HAS_SEC
        select SYS_FSL_HAS_DDR4
@@ -196,12 +197,13 @@ config SYS_LS_PPA_FW_ADDR
 config SYS_LS_PPA_ESBC_ADDR
        hex "hdr address of PPA firmware loading from"
        depends on FSL_LS_PPA && CHAIN_OF_TRUST
-       default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A
-       default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A
-       default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A
-       default 0x580c40000 if SYS_LS_PPA_FW_IN_XIP && FSL_LSCH3
-       default 0x700000 if SYS_LS_PPA_FW_IN_MMC
-       default 0x700000 if SYS_LS_PPA_FW_IN_NAND
+       default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A
+       default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A
+       default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A
+       default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A
+       default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A
+       default 0x680000 if SYS_LS_PPA_FW_IN_MMC
+       default 0x680000 if SYS_LS_PPA_FW_IN_NAND
        help
          If the PPA header firmware locate at XIP flash, such as NOR or
          QSPI flash, this address is a directly memory-mapped.
@@ -268,6 +270,9 @@ config SYS_FSL_IFC_BANK_COUNT
 config SYS_FSL_HAS_CCI400
        bool
 
+config SYS_FSL_HAS_CCN504
+       bool
+
 config SYS_FSL_HAS_DP_DDR
        bool