Convert CONFIG_ARCH_EARLY_INIT_R to Kconfig

[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 92e8fa6..d93a61d 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -5,6 +5,7 @@ config ARCH_LS1012A
        select SYS_FSL_DDR_BE
        select SYS_FSL_MMDC
        select SYS_FSL_ERRATUM_A010315
+       select ARCH_EARLY_INIT_R
 
 config ARCH_LS1043A
        bool
@@ -22,6 +23,7 @@ config ARCH_LS1043A
        select SYS_FSL_ERRATUM_A010539
        select SYS_FSL_HAS_DDR3
        select SYS_FSL_HAS_DDR4
+       select ARCH_EARLY_INIT_R
 
 config ARCH_LS1046A
        bool
@@ -38,6 +40,7 @@ config ARCH_LS1046A
        select SYS_FSL_ERRATUM_A010539
        select SYS_FSL_HAS_DDR4
        select SYS_FSL_SRDS_2
+       select ARCH_EARLY_INIT_R
 
 config ARCH_LS2080A
        bool
@@ -62,6 +65,7 @@ config ARCH_LS2080A
        select SYS_FSL_ERRATUM_A009803
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_A010165
+       select ARCH_EARLY_INIT_R
 
 config FSL_LSCH2
        bool
@@ -90,25 +94,49 @@ config FSL_PCIE_COMPAT
          This compatible is used to find pci controller node in Kernel DT
          to complete fixup.
 
+config HAS_FEATURE_GIC64K_ALIGN
+       bool
+       default y if ARCH_LS1043A
+
+config HAS_FEATURE_ENHANCED_MSI
+       bool
+       default y if ARCH_LS1043A
+
 menu "Layerscape PPA"
 config FSL_LS_PPA
        bool "FSL Layerscape PPA firmware support"
        depends on !ARMV8_PSCI
-       depends on ARCH_LS1043A || ARCH_LS1046A
-       select FSL_PPA_ARMV8_PSCI
+       select ARMV8_SEC_FIRMWARE_SUPPORT
+       select SEC_FIRMWARE_ARMV8_PSCI
+       select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if FSL_LSCH2
        help
          The FSL Primary Protected Application (PPA) is a software component
          which is loaded during boot stage, and then remains resident in RAM
          and runs in the TrustZone after boot.
          Say y to enable it.
+choice
+       prompt "FSL Layerscape PPA firmware loading-media select"
+       depends on FSL_LS_PPA
+       default SYS_LS_PPA_FW_IN_XIP
 
-config FSL_PPA_ARMV8_PSCI
-       bool "PSCI implementation in PPA firmware"
+config SYS_LS_PPA_FW_IN_XIP
+       bool "XIP"
+       help
+         Say Y here if the PPA firmware locate at XIP flash, such
+         as NOR or QSPI flash.
+
+endchoice
+
+config SYS_LS_PPA_FW_ADDR
+       hex "Address of PPA firmware loading from"
        depends on FSL_LS_PPA
+       default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+       default 0x60500000 if SYS_LS_PPA_FW_IN_XIP
        help
-         This config enables the ARMv8 PSCI implementation in PPA firmware.
-         This is a private PSCI implementation and different from those
-         implemented under the common ARMv8 PSCI framework.
+         If the PPA firmware locate at XIP flash, such as NOR or
+         QSPI flash, this address is a directly memory-mapped.
+         If it is in a serial accessed flash, such as NAND and SD
+         card, it is a byte offset.
 endmenu
 
 config SYS_FSL_ERRATUM_A010315
@@ -131,7 +159,7 @@ config MAX_CPUS
          in spin table to properly handle all cores.
 
 config SECURE_BOOT
-       bool
+       bool "Secure Boot"
        help
                Enable Freescale Secure Boot feature