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

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index 724d4c0bd3c7510008eab92e16a72111a40f80aa..7accdad79d20abe4ae5af333fd7900a48cedf0b4 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -59,6 +59,13 @@ config CC_OPTIMIZE_FOR_SIZE
 
          This option is enabled by default for U-Boot.
 
+config CC_COVERAGE
+       bool "Enable code coverage analysis"
+       depends on SANDBOX
+       help
+         Enabling this option will pass "--coverage" to gcc to compile
+         and link code instrumented for coverage analysis.
+
 config DISTRO_DEFAULTS
        bool "Select defaults suitable for booting general purpose Linux distributions"
        default y if ARCH_SUNXI || TEGRA
@@ -69,20 +76,38 @@ config DISTRO_DEFAULTS
        imply USE_BOOTCOMMAND
        select CMD_BOOTZ if ARM && !ARM64
        select CMD_BOOTI if ARM64
-       select CMD_DHCP if NET
+       select CMD_DHCP if CMD_NET
+       select CMD_PING if CMD_NET
        select CMD_PXE if NET
        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
        select CMD_FS_GENERIC
-       select CMD_MII if NET
-       select CMD_PING if NET
-       select CMD_PART
+       imply CMD_MII if NET
+       select CMD_PART if PARTITIONS
        select HUSH_PARSER
+       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
@@ -381,6 +406,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.