ARM: Kconfig: Move TI_SECURE_DEVICE to a common area

[people/ms/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0956d41f527ac6db5cf8e4e60ef271847f50d836..2c52ff025a2219b7578ceefe3c014705d207a075 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -287,9 +287,8 @@ config ENABLE_ARM_SOC_BOOT0_HOOK
        bool "prepare BOOT0 header"
        help
          If the SoC's BOOT0 requires a header area filled with (magic)
-         values, then choose this option, and create a define called
-         ARM_SOC_BOOT0_HOOK which contains the required assembler
-         preprocessor code.
+         values, then choose this option, and create a file included as
+         <asm/arch/boot0.h> which contains the required assembler code.
 
 config ARM_CORTEX_CPU_IS_UP
        bool
@@ -699,16 +698,17 @@ config ARCH_SOCFPGA
        select OF_CONTROL
        select SPL_OF_CONTROL
        select DM
-       select DM_SPI_FLASH
-       select DM_SPI
        select ENABLE_ARM_SOC_BOOT0_HOOK
        select ARCH_EARLY_INIT_R
        select ARCH_MISC_INIT
-       select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
        select SYS_THUMB_BUILD
        imply CMD_MTDPARTS
        imply CRC32_VERIFY
+       imply DM_SPI
+       imply DM_SPI_FLASH
        imply FAT_WRITE
+       imply HW_WATCHDOG
+       imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
@@ -1190,6 +1190,16 @@ config ARCH_ASPEED
 
 endchoice
 
+config TI_SECURE_DEVICE
+       bool "HS Device Type Support"
+       depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS
+       help
+         If a high secure (HS) device type is being used, this config
+         must be set. This option impacts various aspects of the
+         build system (to create signed boot images that can be
+         authenticated) and the code. See the doc/README.ti-secure
+         file for further details.
+
 source "arch/arm/mach-aspeed/Kconfig"
 
 source "arch/arm/mach-at91/Kconfig"
@@ -1331,7 +1341,7 @@ source "arch/arm/Kconfig.debug"
 endmenu
 
 config SPL_LDSCRIPT
-        default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if TARGET_APX4DEVKIT || TARGET_BG0900 || TARGET_M28EVK || TARGET_MX23_OLINUXINO || TARGET_MX23EVK || TARGET_MX28EVK || TARGET_SANSA_FUZE_PLUS || TARGET_SC_SPS_1 || TARGET_TS4600 || TARGET_XFI3
+        default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX23 || ARCH_MX28
         default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
        default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64