ARM: Kconfig: Move TI_SECURE_DEVICE to a common area

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

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 013586edd97fbf98935f46e4b8bfed07e1c87d6f..62c25c404436fdebfd8ca1fb9d6c7d12e484eff6 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -11,6 +11,7 @@ config OMAP34XX
        select ARM_ERRATA_621766
        select ARM_ERRATA_725233
        select USE_TINY_PRINTF
+       imply NAND_OMAP_GPMC
        imply SPL_EXT_SUPPORT
        imply SPL_FAT_SUPPORT
        imply SPL_GPIO_SUPPORT
@@ -20,14 +21,18 @@ config OMAP34XX
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT
        imply SPL_NAND_SUPPORT
+       imply SPL_OMAP3_ID_NAND
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        imply TWL4030_POWER
 
 config OMAP44XX
        bool "OMAP44XX SoC"
        select USE_TINY_PRINTF
+       imply NAND_OMAP_ELM
+       imply NAND_OMAP_GPMC
        imply SPL_DISPLAY_PRINT
        imply SPL_EXT_SUPPORT
        imply SPL_FAT_SUPPORT
@@ -37,15 +42,19 @@ config OMAP44XX
        imply SPL_LIBDISK_SUPPORT
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT
+       imply SPL_NAND_SIMPLE
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
 
 config OMAP54XX
        bool "OMAP54XX SoC"
        select ARM_ERRATA_798870
        select SYS_THUMB_BUILD
+       imply NAND_OMAP_ELM
+       imply NAND_OMAP_GPMC
        imply SPL_DISPLAY_PRINT
        imply SPL_ENV_SUPPORT
        imply SPL_EXT_SUPPORT
@@ -56,9 +65,12 @@ config OMAP54XX
        imply SPL_LIBDISK_SUPPORT
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT
+       imply SPL_NAND_AM33XX_BCH
+       imply SPL_NAND_AM33XX_BCH
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
 
 config TI814X
        bool "TI814X SoC"
@@ -69,6 +81,8 @@ config TI814X
 
 config TI816X
        bool "TI816X SoC"
+       imply NAND_OMAP_ELM
+       imply NAND_OMAP_GPMC
        help
          Support for AM335x SOC from Texas Instruments.
          The AM335x high performance SOC features a Cortex-A8
@@ -76,12 +90,17 @@ config TI816X
 
 config AM43XX
        bool "AM43XX SoC"
+       imply NAND_OMAP_ELM
+       imply NAND_OMAP_GPMC
        imply SPL_DM
        imply SPL_DM_SEQ_ALIAS
+       imply SPL_NAND_AM33XX_BCH
+       imply SPL_NAND_SUPPORT
        imply SPL_OF_CONTROL
        imply SPL_OF_TRANSLATE
        imply SPL_SEPARATE_BSS
        imply SPL_SYS_MALLOC_SIMPLE
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        help
          Support for AM43xx SOC from Texas Instruments.
@@ -92,6 +111,11 @@ config AM43XX
 
 config AM33XX
        bool "AM33XX SoC"
+       imply NAND_OMAP_ELM
+       imply NAND_OMAP_GPMC
+       imply SPL_NAND_AM33XX_BCH
+       imply SPL_NAND_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        imply USE_TINY_PRINTF
        help
@@ -109,16 +133,6 @@ config SYS_MPUCLK
        help
          Defines the MPU clock speed (in MHz).
 
-config TI_SECURE_DEVICE
-       bool "HS Device Type Support"
-       depends on OMAP54XX || AM43XX || AM33XX || ARCH_KEYSTONE
-       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.
-
 config TI_SECURE_EMIF_REGION_START
        hex "Reserved EMIF region start address"
        depends on TI_SECURE_DEVICE
@@ -165,4 +179,7 @@ source "board/ti/am335x/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 
+config SPL_LDSCRIPT
+        default "arch/arm/mach-omap2/u-boot-spl.lds"
+
 endif