Azure CI: Save pytest output automatically

[J-u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index ef94f88adc28212370ae4efffca8c4676633a4cd..a75cce7e28fb07b12d805b0af6779f879f32212b 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -264,8 +264,8 @@ config HAS_CUSTOM_SYS_INIT_SP_ADDR
        default y if TFABOOT
        help
          Typically, we use an initial stack pointer address that is calculated
-         by taking the statically defined CONFIG_SYS_INIT_RAM_ADDR, adding the
-         statically defined CONFIG_SYS_INIT_RAM_SIZE and then subtracting the
+         by taking the statically defined CFG_SYS_INIT_RAM_ADDR, adding the
+         statically defined CFG_SYS_INIT_RAM_SIZE and then subtracting the
          build-time constant of GENERATED_GBL_DATA_SIZE.  On MIPS a different
          but statica calculation is performed.  However, some platforms will
          take a different approach.  Say Y here to define the address statically
@@ -333,7 +333,7 @@ config SPL_SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
-         It is possible to enable CONFIG_SYS_SPL_MALLOC_START to start a new
+         It is possible to enable CFG_SYS_SPL_MALLOC_START to start a new
          malloc() region in SDRAM once it is inited.
 
 config TPL_SYS_MALLOC_F_LEN
@@ -456,11 +456,12 @@ config BUILD_TARGET
        string "Build target special images"
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
-       default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
+       default "u-boot-with-spl.kwb" if ARMADA_32BIT && SPL
        default "u-boot-elf.srec" if RCAR_GEN3
        default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
                                ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
-       default "u-boot.kwb" if ARCH_KIRKWOOD
+       default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL
+       default "u-boot-with-spl.bin" if MPC85xx && !E500MC && !E5500 && !E6500 && SPL
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
        help
@@ -583,6 +584,18 @@ config SYS_SRAM_SIZE
        default 0x10000 if TARGET_TRICORDER
        default 0x0
 
+config SYS_MONITOR_LEN
+       int "Maximum size in bytes reserved for U-Boot in memory"
+       default 1048576 if X86
+       default 786432 if ARCH_SUNXI
+       default 0
+       help
+         Size of memory reserved for monitor code, used to determine
+         _at_compile_time_ (!) if the environment is embedded within the
+         U-Boot image, or in a separate flash sector, among other uses where
+         we need to set a maximum size of the U-Boot binary itself that will
+         be loaded.
+
 config MP
        bool "Support for multiprocessor"
        help