ARM: imx: soc: Move default TEXT_BASE for i.MX7

[J-u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 74e8ce5edfd2d1319678d2b30c07c4640901ba23..a7b2b6db74255b214e41affdb31899c6ac284101 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -647,6 +647,8 @@ 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
@@ -758,8 +760,37 @@ source "dts/Kconfig"
 
 source "env/Kconfig"
 
+menu Networking
+
+choice
+       prompt "Networking stack"
+       default NET
+
+config NO_NET
+       bool "No networking support"
+
+config NET
+       bool "Legacy U-Boot networking stack"
+       imply NETDEVICES
+
+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"