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

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index abbc89a..fbe9087 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -12,7 +12,6 @@ config ARM64
 if ARM64
 config POSITION_INDEPENDENT
        bool "Generate position-independent pre-relocation code"
-       select INIT_SP_RELATIVE
        help
          U-Boot expects to be linked to a specific hard-coded address, and to
          be loaded to and run from that address. This option lifts that
@@ -23,6 +22,8 @@ config POSITION_INDEPENDENT
 
 config INIT_SP_RELATIVE
        bool "Specify the early stack pointer relative to the .bss section"
+       default n if ARCH_QEMU
+       default y if POSITION_INDEPENDENT
        help
          U-Boot typically uses a hard-coded value for the stack pointer
          before relocation. Enable this option to instead calculate the
@@ -76,7 +77,7 @@ config GIC_V3_ITS
 
 config STATIC_RELA
        bool
-       default y if ARM64 && !POSITION_INDEPENDENT
+       default y if ARM64
 
 config DMA_ADDR_T_64BIT
        bool
@@ -932,12 +933,12 @@ config ARCH_OWL
 
 config ARCH_QEMU
        bool "QEMU Virtual Platform"
-       select ARCH_SUPPORT_TFABOOT
        select DM
        select DM_SERIAL
        select OF_CONTROL
        select PL01X_SERIAL
        imply CMD_DM
+       imply DM_RNG
        imply DM_RTC
        imply RTC_PL031
 
@@ -994,7 +995,7 @@ config ARCH_SOCFPGA
        select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select SYSRESET
        select SYSRESET_SOCFPGA if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
-       select SYSRESET_SOCFPGA_S10 if TARGET_SOCFPGA_STRATIX10
+       select SYSRESET_SOCFPGA_SOC64 if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
        imply CMD_DM
        imply CMD_MTDPARTS
        imply CRC32_VERIFY
@@ -1325,6 +1326,18 @@ config TARGET_LX2160AQDS
          is a high-performance development platform that supports the
          QorIQ LX2160A/LX2120A/LX2080A Layerscape Architecture processor.
 
+config TARGET_LX2162AQDS
+       bool "Support lx2162aqds"
+       select ARCH_LX2162A
+       select ARCH_MISC_INIT
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select ARCH_SUPPORT_TFABOOT
+       select BOARD_LATE_INIT
+       help
+         Support for NXP LX2162AQDS platform.
+         The lx2162aqds support is based on LX2160A Layerscape Architecture processor.
+
 config TARGET_HIKEY
        bool "Support HiKey 96boards Consumer Edition Platform"
        select ARM64
@@ -1619,6 +1632,16 @@ config TARGET_LS1046AFRWY
          development platform that supports the QorIQ LS1046A
          Layerscape Architecture processor.
 
+config TARGET_SL28
+       bool "Support sl28"
+       select ARCH_LS1028A
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       select BINMAN
+       help
+         Support for Kontron SMARC-sAL28 board.
+
 config TARGET_COLIBRI_PXA270
        bool "Support colibri_pxa270"
        select CPU_PXA
@@ -1710,7 +1733,7 @@ config ARCH_STM32MP
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
        select BLK
-       select BINMAN if !ARM64
+       select BINMAN if SPL_OPTEE
        select DM
        select DM_GPIO
        select DM_I2C
@@ -1743,6 +1766,7 @@ config ARCH_ROCKCHIP
 
 config ARCH_OCTEONTX
        bool "Support OcteonTX SoCs"
+       select CLK
        select DM
        select ARM64
        select OF_CONTROL
@@ -1752,6 +1776,7 @@ config ARCH_OCTEONTX
 
 config ARCH_OCTEONTX2
        bool "Support OcteonTX2 SoCs"
+       select CLK
        select DM
        select ARM64
        select OF_CONTROL
@@ -1801,8 +1826,13 @@ config TFABOOT
        depends on ARCH_SUPPORT_TFABOOT
        default n
        help
-         Enabling this will make a U-Boot binary that is capable of being
-         booted via TF-A (Trusted Firmware for Cortex-A).
+         Some platforms support the setup of secure registers (for instance
+         for CPU errata handling) or provide secure services like PSCI.
+         Those services could also be provided by other firmware parts
+         like TF-A (Trusted Firmware for Cortex-A), in which case U-Boot
+         does not need to (and cannot) execute this code.
+         Enabling this option will make a U-Boot binary that is relying
+         on other firmware layers to provide secure functionality.
 
 config TI_SECURE_DEVICE
        bool "HS Device Type Support"
@@ -1990,6 +2020,7 @@ source "board/hisilicon/hikey/Kconfig"
 source "board/hisilicon/hikey960/Kconfig"
 source "board/hisilicon/poplar/Kconfig"
 source "board/isee/igep003x/Kconfig"
+source "board/kontron/sl28/Kconfig"
 source "board/myir/mys_6ulx/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"