Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index ef12f9fbee403c2e9786764f64ff2070f6e336cb..45a06696a19f52083be2c8df5b228f747c2b750b 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -57,7 +57,8 @@ config DISTRO_DEFAULTS
        bool "Select defaults suitable for booting general purpose Linux distributions"
        default y if ARCH_SUNXI
        default n
-       select CMD_BOOTZ
+       select CMD_BOOTZ if ARM && !ARM64
+       select CMD_BOOTI if ARM64
        select CMD_DHCP
        select CMD_EXT2
        select CMD_EXT4
@@ -124,6 +125,14 @@ config TOOLS_DEBUG
          debug through the source code, etc.
 
 endif
+
+config PHYS_64BIT
+       bool "64bit physical address support"
+       help
+         Say Y here to support 64bit physical memory address.
+         This can be used not only for 64bit SoCs, but also for
+         large physical address extention on 32bit SoCs.
+
 endmenu                # General setup
 
 menu "Boot images"
@@ -336,12 +345,35 @@ config SPL_FIT_IMAGE_POST_PROCESS
          injected into the FIT creation (i.e. the blobs would have been pre-
          processed before being added to the FIT image).
 
+config FIT_IMAGE_POST_PROCESS
+       bool "Enable post-processing of FIT artifacts after loading by U-Boot"
+       depends on FIT && TI_SECURE_DEVICE
+       help
+         Allows doing any sort of manipulation to blobs after they got extracted
+         from FIT images like stripping off headers or modifying the size of the
+         blob, verification, authentication, decryption etc. in a platform or
+         board specific way. In order to use this feature a platform or board-
+         specific implementation of board_fit_image_post_process() must be
+         provided. Also, anything done during this post-processing step would
+         need to be comprehended in how the images were prepared before being
+         injected into the FIT creation (i.e. the blobs would have been pre-
+         processed before being added to the FIT image).
+
 config SYS_CLK_FREQ
        depends on ARC || ARCH_SUNXI
        int "CPU clock frequency"
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
+config ARCH_FIXUP_FDT
+       bool "Enable arch_fixup_fdt() call"
+       depends on ARM || MIPS
+       default y
+       help
+         Enable FDT memory map syncup before OS boot. This feature can be
+         used for booting OS with different memory setup where the part of
+         the memory location should be used for different purpose.
+
 endmenu                # Boot images
 
 source "common/Kconfig"