Convert CONFIG_FLASH_SPANSION_S29WS_N et al to Kconfig

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

diff --git a/Kconfig b/Kconfig
index 991b260..d29519c 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
@@ -274,7 +274,7 @@ config HAS_CUSTOM_SYS_INIT_SP_ADDR
 config CUSTOM_SYS_INIT_SP_ADDR
        hex "Static location for the initial stack pointer"
        depends on HAS_CUSTOM_SYS_INIT_SP_ADDR
-       default SYS_TEXT_BASE if TFABOOT
+       default TEXT_BASE if TFABOOT
 
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
@@ -299,7 +299,7 @@ config SYS_MALLOC_F_LEN
        default 0x4000 if SANDBOX || RISCV || ARCH_APPLE || ROCKCHIP_RK3368 || \
                          ROCKCHIP_RK3399
        default 0x8000 if RCAR_GEN3
-       default 0x10000 if ARCH_IMX8 || (ARCH_IMX8M && !IMX8MQ)
+       default 0x10000 if ARCH_IMX8 || ARCH_IMX8M
        default 0x2000
        help
          Before relocation, memory is very limited on many platforms. Still,
@@ -312,9 +312,9 @@ config SYS_MALLOC_LEN
        default 0x4000000 if SANDBOX
        default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON
        default 0x200000 if ARCH_BMIPS || X86
-       default 0x120000 if MACH_SUNIV
-       default 0x220000 if MACH_SUN8I_V3S
-       default 0x4020000 if ARCH_SUNXI
+       default 0x4020000 if SUNXI_MINIMUM_DRAM_MB >= 256
+       default 0x220000 if SUNXI_MINIMUM_DRAM_MB >= 64
+       default 0x120000 if SUNXI_MINIMUM_DRAM_MB >= 32
        default 0x400000
        help
          This defines memory to be allocated for Dynamic allocation
@@ -325,6 +325,7 @@ config SPL_SYS_MALLOC_F_LEN
        depends on SYS_MALLOC_F && SPL
        default 0 if !SPL_FRAMEWORK
        default 0x2800 if RCAR_GEN3
+       default 0x2000 if IMX8MQ
        default SYS_MALLOC_F_LEN
        help
          In SPL memory is very limited on many platforms. Still,
@@ -332,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
@@ -455,7 +456,7 @@ 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 ARCH_MVEBU && 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)
@@ -539,7 +540,7 @@ config PLATFORM_ELFENTRY
 
 config STACK_SIZE
        hex "Define max stack size that can be used by U-Boot"
-       default 0x4000000 if ARCH_VERSAL || ARCH_ZYNQMP
+       default 0x4000000 if ARCH_VERSAL_NET || ARCH_VERSAL || ARCH_ZYNQMP
        default 0x200000 if MICROBLAZE
        default 0x1000000
        help
@@ -582,6 +583,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