X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Kconfig;h=6670913799fa9e3033528461769aef26801fb271;hb=ba7b6dfae110eb2accc3fa3b25379cee9a7f43f0;hp=f713c6a9b188a99249f60248444585d2b69a860a;hpb=405fc8305baef921593b822809fb7bf60474b73f;p=u-boot

diff --git a/Kconfig b/Kconfig
index f713c6a9b1..6670913799 100644
--- a/Kconfig
+++ b/Kconfig
@@ -69,20 +69,44 @@ config DISTRO_DEFAULTS
 	imply USE_BOOTCOMMAND
 	select CMD_BOOTZ if ARM && !ARM64
 	select CMD_BOOTI if ARM64
-	select CMD_DHCP
-	select CMD_PXE
+	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
-	select CMD_PING
-	select CMD_PART
+	imply CMD_MII if NET
+	select CMD_PING if NET
+	select CMD_PART if PARTITIONS
 	select HUSH_PARSER
+	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
+	select SUPPORT_RAW_INITRD
+	select ENV_VARS_UBOOT_CONFIG
 	help
 	  Select this to enable various options and commands which are suitable
 	  for building u-boot for booting general purpose Linux distributions.
 
+config ENV_VARS_UBOOT_CONFIG
+	bool "Add arch, board, vendor and soc variables to default environment"
+	help
+	  Define this in order to add variables describing the
+	  U-Boot build configuration to the default environment.
+	  These will be named arch, cpu, board, vendor, and soc.
+	  Enabling this option will cause the following to be defined:
+	  - CONFIG_SYS_ARCH
+	  - CONFIG_SYS_CPU
+	  - CONFIG_SYS_BOARD
+	  - CONFIG_SYS_VENDOR
+	  - CONFIG_SYS_SOC
+
 config SYS_BOOT_GET_CMDLINE
 	bool "Enable kernel command line setup"
 	help
@@ -378,15 +402,16 @@ config SYS_EXTRA_OPTIONS
 	  new boards should not use this option.
 
 config SYS_TEXT_BASE
-	depends on ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
-		(M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS || \
-		ARCH_ZYNQ || ARCH_KEYSTONE || ARCH_OMAP2PLUS
+	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
-	  TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
+	  The address in memory that U-Boot will be running from, initially.
 
-	default 0x80800000 if ARCH_OMAP2PLUS
 
 
 config SYS_CLK_FREQ