Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/common/Kconfig b/common/Kconfig
index 1b157e47c3deb4b465868b2d462ebb8597baffd5..b92d0e38366bd3169ee6edece111014f8a8c53ae 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -494,8 +494,39 @@ config LOG_SPL_CONSOLE
          log message is shown - other details like level, category, file and
          line number are omitted.
 
+config LOG_TEST
+       bool "Provide a test for logging"
+       depends on LOG
+       default y if SANDBOX
+       help
+         This enables a 'log test' command to test logging. It is normally
+         executed from a pytest and simply outputs logging information
+         in various different ways to test that the logging system works
+         correctly with varoius settings.
+
+config LOG_ERROR_RETURN
+       bool "Log all functions which return an error"
+       depends on LOG
+       help
+         When an error is returned in U-Boot it is sometimes difficult to
+         figure out the root cause. For eaxmple, reading from SPI flash may
+         fail due to a problem in the SPI controller or due to the flash part
+         not returning the expected information. This option changes
+         log_ret() to log any errors it sees. With this option disabled,
+         log_ret() is a nop.
+
+         You can add log_ret() to all functions which return an error code.
+
 endmenu
 
+config SUPPORT_RAW_INITRD
+       bool "Enable raw initrd images"
+       help
+         Note, defining the SUPPORT_RAW_INITRD allows user to supply
+         kernel with raw initrd images. The syntax is slightly different, the
+         address of the initrd must be augmented by it's size, in the following
+         format: "<initrd address>:<initrd size>".
+
 config DEFAULT_FDT_FILE
        string "Default fdt file"
        help
@@ -523,7 +554,7 @@ config BOARD_LATE_INIT
 
 config DISPLAY_CPUINFO
        bool "Display information about the CPU during start up"
-       default y if ARM || NIOS2 || X86 || XTENSA
+       default y if ARM || NIOS2 || X86 || XTENSA || M68K
        help
          Display information about the CPU that U-Boot is running on
          when U-Boot starts up. The function print_cpuinfo() is called
@@ -578,4 +609,25 @@ config HASH
 
 endmenu
 
+menu "Update support"
+
+config UPDATE_TFTP
+       bool "Auto-update using fitImage via TFTP"
+       depends on FIT
+       help
+         This option allows performing update of NOR with data in fitImage
+         sent via TFTP boot.
+
+config UPDATE_TFTP_CNT_MAX
+       int "The number of connection retries during auto-update"
+       default 0
+       depends on UPDATE_TFTP
+
+config UPDATE_TFTP_MSEC_MAX
+       int "Delay in mSec to wait for the TFTP server during auto-update"
+       default 100
+       depends on UPDATE_TFTP
+
+endmenu
+
 source "common/spl/Kconfig"