Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / arm / cpu / armv7 / ls102xa / Kconfig

diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index 635358e..747059b 100644 (file)
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -1,46 +1,37 @@
 config ARCH_LS1021A
        bool
 config ARCH_LS1021A
        bool

+       select SYS_FSL_DDR_BE if SYS_FSL_DDR
+       select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR

        select SYS_FSL_ERRATUM_A008378
        select SYS_FSL_ERRATUM_A008407
        select SYS_FSL_ERRATUM_A008378
        select SYS_FSL_ERRATUM_A008407

-       select SYS_FSL_ERRATUM_A008997
-       select SYS_FSL_ERRATUM_A009007
-       select SYS_FSL_ERRATUM_A009008
+       select SYS_FSL_ERRATUM_A008850
+       select SYS_FSL_ERRATUM_A008997 if USB
+       select SYS_FSL_ERRATUM_A009007 if USB
+       select SYS_FSL_ERRATUM_A009008 if USB

        select SYS_FSL_ERRATUM_A009663
        select SYS_FSL_ERRATUM_A009663

-       select SYS_FSL_ERRATUM_A009798
+       select SYS_FSL_ERRATUM_A009798 if USB

        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_A010315
        select SYS_FSL_HAS_CCI400
        select SYS_FSL_ERRATUM_A009942
        select SYS_FSL_ERRATUM_A010315
        select SYS_FSL_HAS_CCI400

-       select SYS_FSL_SRDS_1
-       select SYS_HAS_SERDES
-       select SYS_FSL_DDR_BE if SYS_FSL_DDR
-       select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR

        select SYS_FSL_HAS_DDR3 if SYS_FSL_DDR
        select SYS_FSL_HAS_DDR4 if SYS_FSL_DDR
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_COMPAT_5
        select SYS_FSL_SEC_LE
        select SYS_FSL_HAS_DDR3 if SYS_FSL_DDR
        select SYS_FSL_HAS_DDR4 if SYS_FSL_DDR
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_COMPAT_5
        select SYS_FSL_SEC_LE

+       select SYS_FSL_SRDS_1
+       select SYS_HAS_SERDES
+       imply CMD_PCI

        imply SCSI
        imply SCSI_AHCI
        imply SCSI
        imply SCSI_AHCI

-       imply CMD_PCI

 
 menu "LS102xA architecture"
        depends on ARCH_LS1021A
 
 
 menu "LS102xA architecture"
        depends on ARCH_LS1021A
 

-config FSL_PCIE_COMPAT
-       string "PCIe compatible of Kernel DT"
-       depends on PCIE_LAYERSCAPE
-       default "fsl,ls1021a-pcie" if ARCH_LS1021A
-       help
-         This compatible is used to find pci controller node in Kernel DT
-         to complete fixup.
-

 config LS1_DEEP_SLEEP
        bool "Deep sleep"
 config LS1_DEEP_SLEEP
        bool "Deep sleep"

-       depends on ARCH_LS1021A

 
 config MAX_CPUS
        int "Maximum number of CPUs permitted for LS102xA"
 
 config MAX_CPUS
        int "Maximum number of CPUs permitted for LS102xA"

-       depends on ARCH_LS1021A

        default 2
        help
          Set this number to the maximum number of possible CPUs in the SoC.
        default 2
        help
          Set this number to the maximum number of possible CPUs in the SoC.


@@ -49,8 +40,8 @@ config MAX_CPUS
          cores, count the reserved ports. This will allocate enough memory
          in spin table to properly handle all cores.
 
          cores, count the reserved ports. This will allocate enough memory
          in spin table to properly handle all cores.
 

-config SECURE_BOOT
-       bool    "Secure Boot"
+config NXP_ESBC
+       bool    "NXP_ESBC"

        help
                Enable Freescale Secure Boot feature. Normally selected
                by defconfig. If unsure, do not change.
        help
                Enable Freescale Secure Boot feature. Normally selected
                by defconfig. If unsure, do not change.


@@ -63,6 +54,11 @@ config SYS_CCI400_OFFSET
          Offset for CCI400 base.
          CCI400 base addr = CCSRBAR + CCI400_OFFSET
 
          Offset for CCI400 base.
          CCI400 base addr = CCSRBAR + CCI400_OFFSET
 

+config SYS_FSL_ERRATUM_A008850
+       bool
+       help
+         Workaround for DDR erratum A008850
+

 config SYS_FSL_ERRATUM_A008997
        bool
        help
 config SYS_FSL_ERRATUM_A008997
        bool
        help


@@ -100,7 +96,6 @@ config SYS_HAS_SERDES
 
 config SYS_FSL_IFC_BANK_COUNT
        int "Maximum banks of Integrated flash controller"
 
 config SYS_FSL_IFC_BANK_COUNT
        int "Maximum banks of Integrated flash controller"

-       depends on ARCH_LS1021A

        default 8
 
 config SYS_FSL_ERRATUM_A008407
        default 8
 
 config SYS_FSL_ERRATUM_A008407