Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index f713c6a9b188a99249f60248444585d2b69a860a..efd77f3129f9f1fe08eb72669a7ca92ae951d553 100644 (file)
--- 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
+       select CMD_PXE if NET
        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
        select CMD_FS_GENERIC
-       select CMD_MII
-       select CMD_PING
-       select CMD_PART
+       select 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 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,13 @@ 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
        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