Merge tag 'v2025.01-rc5' into next

[u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index ab46b27999c723580ce9e644041df1eb39902a4a..6379a45416647ec7ade8862d5619f70bdc0b6004 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -208,7 +208,7 @@ config ENV_VARS_UBOOT_CONFIG
 
 config NR_DRAM_BANKS
        int "Number of DRAM banks"
-       default 1 if ARCH_SUNXI || ARCH_OWL
+       default 1 if ARCH_SC5XX || ARCH_SUNXI || ARCH_OWL
        default 2 if OMAP34XX
        default 4
        help
@@ -551,6 +551,7 @@ config SYS_LOAD_ADDR
        default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL  || MX6SX || MX6UL || MX6ULL)
        default 0x80800000 if ARCH_MX7
        default 0x90000000 if FSL_LSCH2 || FSL_LSCH3
+       default 0x0 if ARCH_SC5XX
        help
          Address in memory to use as the default safe load address.
 
@@ -577,6 +578,7 @@ config STACK_SIZE
        hex "Define max stack size that can be used by U-Boot"
        default 0x4000000 if ARCH_VERSAL_NET || ARCH_VERSAL || ARCH_ZYNQMP
        default 0x200000 if MICROBLAZE
+       default 0x4000 if ARCH_STM32
        default 0x1000000
        help
          Define Max stack size that can be used by U-Boot. This value is used
@@ -594,30 +596,6 @@ config SYS_MEM_TOP_HIDE
          WARNING: Please make sure that this value is a multiple of the OS
          page size.
 
-config SYS_HAS_SRAM
-       bool
-       default y if TARGET_PIC32MZDASK
-       default y if TARGET_DEVKIT8000
-       default y if TARGET_TRICORDER
-       help
-         Enable this to allow support for the on board SRAM.
-         SRAM base address is controlled by CONFIG_SYS_SRAM_BASE.
-         SRAM size is controlled by CONFIG_SYS_SRAM_SIZE.
-
-config SYS_SRAM_BASE
-       hex
-       default 0x80000000 if TARGET_PIC32MZDASK
-       default 0x40200000 if TARGET_DEVKIT8000
-       default 0x40200000 if TARGET_TRICORDER
-       default 0x0
-
-config SYS_SRAM_SIZE
-       hex
-       default 0x00080000 if TARGET_PIC32MZDASK
-       default 0x10000 if TARGET_DEVKIT8000
-       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
@@ -646,11 +624,18 @@ config HAVE_TEXT_BASE
 config TEXT_BASE
        depends on HAVE_TEXT_BASE
        default 0x0 if POSITION_INDEPENDENT
+       default 0x17800000 if ARCH_MX6
+       default 0x87800000 if ARCH_MX7
        default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
        default 0x81700000 if MACH_SUNIV
        default 0x2a000000 if MACH_SUN9I
        default 0x4a000000 if SUNXI_MINIMUM_DRAM_MB >= 256
        default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64
+       default 0x96000000 if ARCH_SC5XX && SC59X_64
+       default 0xB2200000 if ARCH_SC5XX && SC59X
+       default 0x89200000 if ARCH_SC5XX && TARGET_SC584_EZKIT
+       default 0xC2200000 if ARCH_SC5XX && (TARGET_SC589_EZKIT || TARGET_SC589_MINI)
+       default 0x82200000 if ARCH_SC5XX && SC57X
        hex "Text Base"
        help
          The address in memory that U-Boot will be copied and executed from
@@ -752,8 +737,42 @@ source "dts/Kconfig"
 
 source "env/Kconfig"
 
+menu Networking
+
+choice
+       prompt "Networking stack"
+       default NET
+
+config NO_NET
+       bool "No networking support"
+       help
+         Do not include networking support
+
+config NET
+       bool "Legacy U-Boot networking stack"
+       imply NETDEVICES
+       help
+         Include networking support with U-Boot's internal implementation of
+         the TCP/IP protocol stack.
+
+config NET_LWIP
+       bool "Use lwIP for networking stack"
+       imply NETDEVICES
+       help
+         Include networking support based on the lwIP (lightweight IP)
+         TCP/IP stack (https://nongnu.org/lwip). This is a replacement for
+         the default U-Boot network stack and applications located in net/
+         and enabled via CONFIG_NET as well as other pieces of code that
+         depend on CONFIG_NET (such as cmd/net.c enabled via CONFIG_CMD_NET).
+         Therefore the two symbols CONFIG_NET and CONFIG_NET_LWIP are mutually
+         exclusive.
+
+endchoice
+
 source "net/Kconfig"
 
+endmenu
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"