apalis_imx6: fix set_emmcargs wrapper

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 5f5c5ccfd6b6b51f28ee433f7b7cfd528ef91755..31e75001ff9e694befe873949cdd4055823fa12a 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -138,6 +138,8 @@ config SYS_MALLOC_F_LEN
        depends on SYS_MALLOC_F
        default 0x1000 if AM33XX
        default 0x2800 if SANDBOX
+       default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
+                          ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
        default 0x400
        help
          Before relocation, memory is very limited on many platforms. Still,
@@ -147,7 +149,7 @@ config SYS_MALLOC_F_LEN
 
 config SYS_MALLOC_LEN
        hex "Define memory for Dynamic allocation"
-       depends on ARCH_ZYNQ || ARCH_VERSAL
+       depends on ARCH_ZYNQ || ARCH_VERSAL || ARCH_STM32MP
        help
          This defines memory to be allocated for Dynamic allocation
          TODO: Use for other architectures
@@ -155,6 +157,7 @@ config SYS_MALLOC_LEN
 config SPL_SYS_MALLOC_F_LEN
        hex "Size of malloc() pool in SPL before relocation"
        depends on SYS_MALLOC_F
+       default 0x2800 if RCAR_GEN3
        default SYS_MALLOC_F_LEN
        help
          Before relocation, memory is very limited on many platforms. Still,
@@ -250,6 +253,23 @@ config BUILD_TARGET
          special image will be automatically built upon calling
          make / buildman.
 
+config SYS_CUSTOM_LDSCRIPT
+       bool "Use a custom location for the U-Boot linker script"
+       help
+         Normally when linking U-Boot we will look in the board directory,
+         the CPU directory and finally the "cpu" directory of the architecture
+         for the ile "u-boot.lds" and use that as our linker.  However, in
+         some cases we need to provide a different linker script.  To do so,
+         enable this option and then provide the location under
+         CONFIG_SYS_LDSCRIPT.
+
+config SYS_LDSCRIPT
+       depends on SYS_CUSTOM_LDSCRIPT
+       string "Custom ldscript location"
+       help
+         Path within the source tree to the linker script to use for the
+         main U-Boot binary.
+
 endmenu                # General setup
 
 menu "Boot images"
@@ -388,7 +408,7 @@ config SPL_FIT_SIGNATURE
        select SPL_RSA
 
 config SPL_LOAD_FIT
-       bool "Enable SPL loading U-Boot as a FIT"
+       bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
        select SPL_FIT
        help
          Normally with the SPL framework a legacy image is generated as part
@@ -399,7 +419,7 @@ config SPL_LOAD_FIT
          and passing the correct one to U-Boot.
 
 config SPL_LOAD_FIT_FULL
-       bool "Enable SPL loading U-Boot as a FIT"
+       bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
        select SPL_FIT
        help
          Normally with the SPL framework a legacy image is generated as part