Merge git://git.denx.de/u-boot-x86

[J-u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index fc69189217a15d63b701f74cff93e3cd97964aa6..44b144f1c2a0aa609deaec7526da2a8c224b7799 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -114,6 +114,16 @@ config SPL
        help
          If you want to build SPL as well as the normal image, say Y.
 
+config SPL_SYS_MALLOC_SIMPLE
+       bool
+       depends on SPL
+       prompt "Only use malloc_simple functions in the spl"
+       help
+         Say Y here to only use the *_simple malloc functions from
+         malloc_simple.c, rather then using the versions from dlmalloc.c
+         this will make the SPL binary smaller at the cost of more heap
+         usage as the *_simple malloc functions do not re-use free-ed mem.
+
 config SPL_STACK_R
        depends on SPL
        bool "Enable SDRAM location for SPL stack"
@@ -132,6 +142,16 @@ config SPL_STACK_R_ADDR
          Specify the address in SDRAM for the SPL stack. This will be set up
          before board_init_r() is called.
 
+config SPL_STACK_R_MALLOC_SIMPLE_LEN
+       depends on SPL_STACK_R && SPL_SYS_MALLOC_SIMPLE
+       hex "Size of malloc_simple heap after switching to DRAM SPL stack"
+       default 0x100000
+       help
+         Specify the amount of the stack to use as memory pool for
+         malloc_simple after switching the stack to DRAM. This may be set
+         to give board_init_r() a larger heap then the initial heap in
+         SRAM which is limited to SYS_MALLOC_F_LEN bytes.
+
 config TPL
        bool
        depends on SPL && SUPPORT_TPL
@@ -146,7 +166,7 @@ config FIT
          Flattened Image Tree.  FIT is formally a FDT, which can include
          images of various types (kernel, FDT blob, ramdisk, etc.)
          in a single blob.  To boot this new uImage structure,
-         pass the the address of the blob to the "bootm" command.
+         pass the address of the blob to the "bootm" command.
 
 config FIT_VERBOSE
        bool "Display verbose messages on FIT boot"
@@ -179,6 +199,7 @@ config SYS_EXTRA_OPTIONS
 
 config SYS_TEXT_BASE
        depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP
+       depends on !EFI_APP
        hex "Text Base"
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture