Merge tag 'mips-pull-2018-11-18' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 62235cae96cf852d5cabfcbc054c3a5fbed71ceb..dca9bb4e432929863ae79ab85b5e2f8100cfa16d 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -104,6 +104,12 @@ config ENV_VARS_UBOOT_CONFIG
          - CONFIG_SYS_VENDOR
          - CONFIG_SYS_SOC
 
+config NR_DRAM_BANKS
+       int "Number of DRAM banks"
+       default 4
+       help
+         This defines the number of DRAM banks.
+
 config SYS_BOOT_GET_CMDLINE
        bool "Enable kernel command line setup"
        help
@@ -136,25 +142,32 @@ config SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
+config SYS_MALLOC_LEN
+       hex "Define memory for Dynamic allocation"
+       depends on ARCH_ZYNQ || ARCH_VERSAL
+       help
+         This defines memory to be allocated for Dynamic allocation
+         TODO: Use for other architectures
+
 config SPL_SYS_MALLOC_F_LEN
-        hex "Size of malloc() pool in SPL before relocation"
-        depends on SYS_MALLOC_F
-        default SYS_MALLOC_F_LEN
-        help
-          Before relocation, memory is very limited on many platforms. Still,
-          we can provide a small malloc() pool if needed. Driver model in
-          particular needs this to operate, so that it can allocate the
-          initial serial device and any others that are needed.
+       hex "Size of malloc() pool in SPL before relocation"
+       depends on SYS_MALLOC_F
+       default SYS_MALLOC_F_LEN
+       help
+         Before relocation, memory is very limited on many platforms. Still,
+         we can provide a small malloc() pool if needed. Driver model in
+         particular needs this to operate, so that it can allocate the
+         initial serial device and any others that are needed.
 
 config TPL_SYS_MALLOC_F_LEN
-        hex "Size of malloc() pool in TPL before relocation"
-        depends on SYS_MALLOC_F
-        default SYS_MALLOC_F_LEN
-        help
-          Before relocation, memory is very limited on many platforms. Still,
-          we can provide a small malloc() pool if needed. Driver model in
-          particular needs this to operate, so that it can allocate the
-          initial serial device and any others that are needed.
+       hex "Size of malloc() pool in TPL before relocation"
+       depends on SYS_MALLOC_F
+       default SYS_MALLOC_F_LEN
+       help
+         Before relocation, memory is very limited on many platforms. Still,
+         we can provide a small malloc() pool if needed. Driver model in
+         particular needs this to operate, so that it can allocate the
+         initial serial device and any others that are needed.
 
 menuconfig EXPERT
        bool "Configure standard U-Boot features (expert users)"
@@ -440,7 +453,7 @@ config SYS_EXTRA_OPTIONS
 config SYS_TEXT_BASE
        depends on !NIOS2 && !XTENSA
        depends on !EFI_APP
-       default 0x80800000 if ARCH_OMAP2PLUS
+       default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
        default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S
        default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I
        default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S