Merge tag 'u-boot-at91-fixes-2022.04-a' of https://source.denx.de/u-boot/custodians...

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

diff --git a/Kconfig b/Kconfig
index 931a228..9dd9ec7 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -246,9 +246,10 @@ config SYS_MALLOC_F_LEN
 config SYS_MALLOC_LEN
        hex "Define memory for Dynamic allocation"
        default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON
-       default 0x4020000 if ARCH_SUNXI && !MACH_SUN8I_V3S
        default 0x200000 if ARCH_BMIPS || X86
-       default 0x220000 if ARCH_SUNXI && MACH_SUN8I_V3S
+       default 0x120000 if MACH_SUNIV
+       default 0x220000 if MACH_SUN8I_V3S
+       default 0x4020000 if ARCH_SUNXI
        default 0x400000
        help
          This defines memory to be allocated for Dynamic allocation
@@ -352,6 +353,13 @@ config SPL_IMAGE
          used to generate a combined image with SPL and main U-Boot
          proper as one single image.
 
+config REMAKE_ELF
+       bool "Recreate an ELF image from raw U-Boot binary"
+       help
+         Enable this to recreate an ELF image (u-boot.elf) from the raw
+         U-Boot binary (u-boot.bin), which may already have been statically
+         relocated and may already have a device-tree appended to it.
+
 config BUILD_TARGET
        string "Build target special images"
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
@@ -391,8 +399,9 @@ config SYS_LOAD_ADDR
        hex "Address in memory to use by default"
        default 0x01000000 if ARCH_SOCFPGA
        default 0x02000000 if PPC || X86
+       default 0x81000000 if MACH_SUNIV
        default 0x22000000 if MACH_SUN9I
-       default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I
+       default 0x42000000 if ARCH_SUNXI
        default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3
        default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL  || MX6SX || MX6UL || MX6ULL)
        default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL  || MX6SX || MX6UL || MX6ULL)
@@ -454,6 +463,12 @@ config SYS_SRAM_SIZE
        default 0x10000 if TARGET_TRICORDER
        default 0x0
 
+config MP
+       bool "Support for multiprocessor"
+       help
+         This provides an option to bringup different processors
+         in multiprocessor cases.
+
 config EXAMPLES
        bool "Compile API examples"
        depends on !SANDBOX
@@ -466,6 +481,8 @@ endmenu             # General setup
 
 source "api/Kconfig"
 
+source "boot/Kconfig"
+
 source "common/Kconfig"
 
 source "cmd/Kconfig"