Merge branch 'master' of git://git.denx.de/u-boot-rockchip

[u-boot] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 683cdb92963dbab52b59ae3ba1620e25df396c27..72832ad09944440c040d3d1649042b1ef5dac306 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -22,6 +22,7 @@ config OMAP34XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        imply TWL4030_POWER
 
@@ -40,6 +41,7 @@ config OMAP44XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
 
 config OMAP54XX
@@ -59,6 +61,7 @@ config OMAP54XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_I2C_OMAP24XX
 
 config TI814X
        bool "TI814X SoC"
@@ -82,6 +85,7 @@ config AM43XX
        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 +96,7 @@ config AM43XX
 
 config AM33XX
        bool "AM33XX SoC"
+       imply SYS_I2C_OMAP24XX
        imply SYS_THUMB_BUILD
        imply USE_TINY_PRINTF
        help
@@ -119,6 +124,32 @@ config TI_SECURE_DEVICE
          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
+       default 0x0
+       help
+         Reserved EMIF region start address. Set to "0" to auto-select
+         to be at the end of the external memory region.
+
+config TI_SECURE_EMIF_TOTAL_REGION_SIZE
+       hex "Reserved EMIF region size"
+       depends on TI_SECURE_DEVICE
+       default 0x0
+       help
+         Total reserved EMIF region size. Default is 0, which means no reserved EMIF
+         region on secure devices.
+
+config TI_SECURE_EMIF_PROTECTED_REGION_SIZE
+       hex "Size of protected region within reserved EMIF region"
+       depends on TI_SECURE_DEVICE
+       default 0x0
+       help
+         This config option is used to specify the size of the portion of the total
+         reserved EMIF region set aside for secure OS needs that will  be protected
+         using hardware memory firewalls. This value must be smaller than the
+         TI_SECURE_EMIF_TOTAL_REGION_SIZE value.
+
 source "arch/arm/mach-omap2/omap3/Kconfig"
 
 source "arch/arm/mach-omap2/omap4/Kconfig"
@@ -139,4 +170,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