X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Kconfig;h=6670913799fa9e3033528461769aef26801fb271;hb=734bf172e9db4e3afb24772c368bbb7632bf3921;hp=efd77f3129f9f1fe08eb72669a7ca92ae951d553;hpb=4bafceff0e9e5a36908031e41c69a6b37e82da58;p=u-boot

diff --git a/Kconfig b/Kconfig
index efd77f3129..6670913799 100644
--- a/Kconfig
+++ b/Kconfig
@@ -69,22 +69,22 @@ config DISTRO_DEFAULTS
 	imply USE_BOOTCOMMAND
 	select CMD_BOOTZ if ARM && !ARM64
 	select CMD_BOOTI if ARM64
-	select CMD_DHCP if NET
-	select CMD_PXE if NET
+	select CMD_DHCP if NET && CMD_NET
+	select CMD_PXE if NET && CMD_NET
 	select CMD_EXT2
 	select CMD_EXT4
 	select CMD_FAT
 	select CMD_FS_GENERIC
-	select CMD_MII if NET
+	imply CMD_MII if NET
 	select CMD_PING if NET
 	select CMD_PART if PARTITIONS
 	select HUSH_PARSER
-	select BOOTP_BOOTPATH if NET
-	select BOOTP_DNS if NET
-	select BOOTP_GATEWAY if NET
-	select BOOTP_HOSTNAME if NET
-	select BOOTP_PXE if NET
-	select BOOTP_SUBNETMASK if NET
+	select BOOTP_BOOTPATH if NET && CMD_NET
+	select BOOTP_DNS if NET && CMD_NET
+	select BOOTP_GATEWAY if NET && CMD_NET
+	select BOOTP_HOSTNAME if NET && CMD_NET
+	select BOOTP_PXE if NET && CMD_NET
+	select BOOTP_SUBNETMASK if NET && CMD_NET
 	select CMDLINE_EDITING
 	select AUTO_COMPLETE
 	select SYS_LONGHELP
@@ -405,6 +405,9 @@ config SYS_TEXT_BASE
 	depends on !NIOS2 && !XTENSA
 	depends on !EFI_APP
 	default 0x80800000 if ARCH_OMAP2PLUS
+	default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S
+	default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I
+	default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S
 	hex "Text Base"
 	help
 	  The address in memory that U-Boot will be running from, initially.