Merge tag 'u-boot-imx-20190129' of git://git.denx.de/u-boot-imx

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

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f4babc8d260014a24cf5367e38f24d509e349c11..d9bdcb355a17b1efc49eab245e848a6e5c26b356 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -6,11 +6,11 @@ choice
 
 config OMAP34XX
        bool "OMAP34XX SoC"
+       select ARM_CORTEX_A8_CVE_2017_5715
        select ARM_ERRATA_430973
        select ARM_ERRATA_454179
        select ARM_ERRATA_621766
        select ARM_ERRATA_725233
-       select ARM_CORTEX_A8_CVE_2017_5715
        select USE_TINY_PRINTF
        imply NAND_OMAP_GPMC
        imply SPL_EXT_SUPPORT
@@ -52,9 +52,9 @@ config OMAP44XX
 
 config OMAP54XX
        bool "OMAP54XX SoC"
+       select ARM_CORTEX_A15_CVE_2017_5715
        select ARM_ERRATA_798870
        select SYS_THUMB_BUILD
-       select ARM_CORTEX_A15_CVE_2017_5715
        imply NAND_OMAP_ELM
        imply NAND_OMAP_GPMC
        imply SPL_DISPLAY_PRINT
@@ -116,8 +116,8 @@ config AM43XX
 
 config AM33XX
        bool "AM33XX SoC"
-       select SPECIFY_CONSOLE_INDEX
        select ARM_CORTEX_A8_CVE_2017_5715
+       select SPECIFY_CONSOLE_INDEX
        imply NAND_OMAP_ELM
        imply NAND_OMAP_GPMC
        imply SPL_NAND_AM33XX_BCH
@@ -136,6 +136,7 @@ endchoice
 
 config SYS_MPUCLK
        int "MPU CLK speed"
+       depends on AM33XX
        default 500
        help
          Defines the MPU clock speed (in MHz).
@@ -166,6 +167,21 @@ config TI_SECURE_EMIF_PROTECTED_REGION_SIZE
          using hardware memory firewalls. This value must be smaller than the
          TI_SECURE_EMIF_TOTAL_REGION_SIZE value.
 
+if AM43XX || AM33XX || OMAP54XX
+config ISW_ENTRY_ADDR
+       hex "Address in memory or XIP address of bootloader entry point"
+       default 0x402F4000 if AM43XX
+       default 0x402F0400 if AM33XX
+       default 0x40301350 if OMAP54XX
+       help
+         After any reset, the boot ROM searches the boot media for a valid
+         boot image. For non-XIP devices, the ROM then copies the image into
+         internal memory. For all boot modes, after the ROM processes the
+         boot image it eventually computes the entry point address depending
+         on the device type (secure/non-secure), boot media (xip/non-xip) and
+         image headers.
+endif
+
 source "arch/arm/mach-omap2/omap3/Kconfig"
 
 source "arch/arm/mach-omap2/omap4/Kconfig"