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

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 42672a92df4dd03cf416e92968bb43a3a2e6d474..aff7b2e00a05a9dffdbb5e75b8d0990e592f4ba9 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -126,6 +126,7 @@ config SYS_BOOT_GET_KBD
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM
+
        help
          Before relocation, memory is very limited on many platforms. Still,
          we can provide a small malloc() pool if needed. Driver model in
@@ -136,6 +137,7 @@ config SYS_MALLOC_F_LEN
        hex "Size of malloc() pool before relocation"
        depends on SYS_MALLOC_F
        default 0x1000 if AM33XX
+       default 0x2800 if SANDBOX
        default 0x400
        help
          Before relocation, memory is very limited on many platforms. Still,
@@ -249,6 +251,16 @@ config FIT
 
 if FIT
 
+config FIT_EXTERNAL_OFFSET
+       hex "Text Base"
+       default 0x0
+       help
+         This specifies a data offset in fit image.
+         The offset is from data payload offset to the beginning of
+         fit image header. When specifies a offset, specific data
+         could be put in the hole between data payload and fit image
+         header, such as CSF data on i.MX platform.
+
 config FIT_ENABLE_SHA256_SUPPORT
        bool "Support SHA256 checksum of FIT image contents"
        default y