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

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 31205534941b0835ce24da37f6dfa6e8edc61662..a078f7b1b6676f690f9474eb65645c3d9e69f20f 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -86,6 +86,7 @@ config DISTRO_DEFAULTS
        select SUPPORT_RAW_INITRD
        select SYS_LONGHELP
        imply CMD_MII if NET
+       imply USB_STORAGE
        imply USE_BOOTCOMMAND
        help
          Select this to enable various options and commands which are suitable
@@ -125,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
@@ -135,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,
@@ -210,7 +213,7 @@ config PHYS_64BIT
        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.
+         large physical address extension on 32bit SoCs.
 
 config BUILD_ROM
        bool "Build U-Boot as BIOS replacement"
@@ -248,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