Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[platform/kernel/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index b4ad610..3ce5ba1 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -142,6 +142,26 @@ 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 SPL_SEPARATE_BSS
+       depends on SPL
+       bool "BSS section is in a different memory region from text"
+       help
+         Some platforms need a large BSS region in SPL and can provide this
+         because RAM is already set up. In this case BSS can be moved to RAM.
+         This option should then be enabled so that the correct device tree
+         location is used. Normally we put the device tree at the end of BSS
+         but with this option enabled, it goes at _image_binary_end.
+
 config TPL
        bool
        depends on SPL && SUPPORT_TPL
@@ -188,7 +208,8 @@ config SYS_EXTRA_OPTIONS
          new boards should not use this option.
 
 config SYS_TEXT_BASE
-       depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP
+       depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
+               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE
        depends on !EFI_APP
        hex "Text Base"
        help
@@ -204,6 +225,8 @@ endmenu             # Boot images
 
 source "common/Kconfig"
 
+source "cmd/Kconfig"
+
 source "dts/Kconfig"
 
 source "net/Kconfig"