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

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index 0b73006a68c1b28d61aa93175943064ddfeeaf10..6957097499d1d07b2aba2db526a6f1be0f7fd66d 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
@@ -71,7 +78,7 @@ config DISTRO_DEFAULTS
        select CMD_BOOTI if ARM64
        select CMD_DHCP if CMD_NET
        select CMD_PING if CMD_NET
-       select CMD_PXE if NET && CMD_NET
+       select CMD_PXE if NET
        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
@@ -125,6 +132,7 @@ config SYS_MALLOC_F
 config SYS_MALLOC_F_LEN
        hex "Size of malloc() pool before relocation"
        depends on SYS_MALLOC_F
+       default 0x1000 if AM33XX
        default 0x400
        help
          Before relocation, memory is very limited on many platforms. Still,