imx6q: engicam: Use SPL_LOAD_FIT for MMC boards

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

diff --git a/common/Kconfig b/common/Kconfig
index 27dde11b14c47431d2a6ad15b6c1bfd1973a6f69..d5bc37e4c7ba0a21f584a7c00773fc86d3f30667 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -46,15 +46,6 @@ config BOOTSTAGE_REPORT
                 29,916,167 26,005,792  bootm_start
                 30,361,327    445,160  start_kernel
 
                 29,916,167 26,005,792  bootm_start
                 30,361,327    445,160  start_kernel
 

-config BOOTSTAGE_USER_COUNT
-       int "Number of boot ID numbers available for user use"
-       default 20
-       help
-         This is the number of available user bootstage records.
-         Each time you call bootstage_mark(BOOTSTAGE_ID_ALLOC, ...)
-         a new ID will be allocated from this stash. If you exceed
-         the limit, recording will stop.
-

 config BOOTSTAGE_RECORD_COUNT
        int "Number of boot stage records to store"
        default 30
 config BOOTSTAGE_RECORD_COUNT
        int "Number of boot stage records to store"
        default 30


@@ -62,6 +53,13 @@ config BOOTSTAGE_RECORD_COUNT
          This is the size of the bootstage record list and is the maximum
          number of bootstage records that can be recorded.
 
          This is the size of the bootstage record list and is the maximum
          number of bootstage records that can be recorded.
 

+config SPL_BOOTSTAGE_RECORD_COUNT
+       int "Number of boot stage records to store for SPL"
+       default 5
+       help
+         This is the size of the bootstage record list and is the maximum
+         number of bootstage records that can be recorded.
+

 config BOOTSTAGE_FDT
        bool "Store boot timing information in the OS device tree"
        depends on BOOTSTAGE
 config BOOTSTAGE_FDT
        bool "Store boot timing information in the OS device tree"
        depends on BOOTSTAGE


@@ -174,75 +172,6 @@ config SPI_BOOT
 
 endmenu
 
 
 endmenu
 

-menu "Environment"
-
-if ARCH_SUNXI
-
-choice
-       prompt "Environment Device"
-       default ENV_IS_IN_MMC if ARCH_SUNXI
-
-config ENV_IS_IN_MMC
-       bool "Environment in an MMC device"
-       depends on CMD_MMC
-       help
-         Define this if you have an MMC device which you want to use for the
-         environment.
-
-config ENV_IS_IN_NAND
-       bool "Environment in a NAND device"
-       depends on CMD_NAND
-       help
-         Define this if you have a NAND device which you want to use for the
-         environment.
-
-config ENV_IS_IN_UBI
-       bool "Environment in a UBI volume"
-       depends on CMD_UBI
-       depends on CMD_MTDPARTS
-       help
-         Define this if you have a UBI volume which you want to use for the
-         environment.
-
-config ENV_IS_NOWHERE
-       bool "Environment is not stored"
-       help
-         Define this if you don't want to or can't have an environment stored
-         on a storage medium
-
-endchoice
-
-config ENV_OFFSET
-       hex "Environment Offset"
-       depends on !ENV_IS_IN_UBI
-       depends on !ENV_IS_NOWHERE
-       default 0x88000 if ARCH_SUNXI
-       help
-         Offset from the start of the device (or partition)
-
-config ENV_SIZE
-       hex "Environment Size"
-       depends on !ENV_IS_NOWHERE
-       default 0x20000 if ARCH_SUNXI
-       help
-         Size of the environment storage area
-
-config ENV_UBI_PART
-       string "UBI partition name"
-       depends on ENV_IS_IN_UBI
-       help
-         MTD partition containing the UBI device
-
-config ENV_UBI_VOLUME
-       string "UBI volume name"
-       depends on ENV_IS_IN_UBI
-       help
-         Name of the volume that you want to store the environment in.
-
-endif
-
-endmenu
-

 config BOOTDELAY
        int "delay in seconds before automatically booting"
        default 2
 config BOOTDELAY
        int "delay in seconds before automatically booting"
        default 2


@@ -255,6 +184,39 @@ config BOOTDELAY
 
          See doc/README.autoboot for details.
 
 
          See doc/README.autoboot for details.
 

+config USE_BOOTARGS
+       bool "Enable boot arguments"
+       help
+         Provide boot arguments to bootm command. Boot arguments are specified
+         in CONFIG_BOOTARGS option. Enable this option to be able to specify
+         CONFIG_BOOTARGS string. If this option is disabled, CONFIG_BOOTARGS
+         will be undefined and won't take any space in U-Boot image.
+
+config BOOTARGS
+       string "Boot arguments"
+       depends on USE_BOOTARGS
+       help
+         This can be used to pass arguments to the bootm command. The value of
+         CONFIG_BOOTARGS goes into the environment value "bootargs". Note that
+         this value will also override the "chosen" node in FDT blob.
+
+config USE_BOOTCOMMAND
+       bool "Enable a default value for bootcmd"
+       help
+         Provide a default value for the bootcmd entry in the environment.  If
+         autoboot is enabled this is what will be run automatically.  Enable
+         this option to be able to specify CONFIG_BOOTCOMMAND as a string.  If
+         this option is disabled, CONFIG_BOOTCOMMAND will be undefined and
+         won't take any space in U-Boot image.
+
+config BOOTCOMMAND
+       string "bootcmd value"
+       depends on USE_BOOTCOMMAND
+       default "run distro_bootcmd" if DISTRO_DEFAULTS
+       help
+         This is the string of commands that will be used as bootcmd and if
+         AUTOBOOT is set, automatically run.
+

 menu "Console"
 
 config MENU
 menu "Console"
 
 config MENU


@@ -296,6 +258,27 @@ config IDENT_STRING
        help
          This options adds the board specific name to u-boot version.
 
        help
          This options adds the board specific name to u-boot version.
 

+config LOGLEVEL
+       int "loglevel"
+       default 4
+       range 0 8
+       help
+         All Messages with a loglevel smaller than the console loglevel will
+         be compiled in. The loglevels are defined as follows:
+
+         0 (KERN_EMERG)          system is unusable
+         1 (KERN_ALERT)          action must be taken immediately
+         2 (KERN_CRIT)           critical conditions
+         3 (KERN_ERR)            error conditions
+         4 (KERN_WARNING)        warning conditions
+         5 (KERN_NOTICE)         normal but significant condition
+         6 (KERN_INFO)           informational
+         7 (KERN_DEBUG)          debug-level messages
+
+config SPL_LOGLEVEL
+       int
+       default LOGLEVEL
+

 config SILENT_CONSOLE
        bool "Support a silent console"
        help
 config SILENT_CONSOLE
        bool "Support a silent console"
        help


@@ -437,6 +420,105 @@ config SYS_STDIO_DEREGISTER
 
 endmenu
 
 
 endmenu
 

+menu "Logging"
+
+config LOG
+       bool "Enable logging support"
+       help
+         This enables support for logging of status and debug messages. These
+         can be displayed on the console, recorded in a memory buffer, or
+         discarded if not needed. Logging supports various categories and
+         levels of severity.
+
+config SPL_LOG
+       bool "Enable logging support in SPL"
+       help
+         This enables support for logging of status and debug messages. These
+         can be displayed on the console, recorded in a memory buffer, or
+         discarded if not needed. Logging supports various categories and
+         levels of severity.
+
+config LOG_MAX_LEVEL
+       int "Maximum log level to record"
+       depends on LOG
+       default 5
+       help
+         This selects the maximum log level that will be recorded. Any value
+         higher than this will be ignored. If possible log statements below
+         this level will be discarded at build time. Levels:
+
+           0 - panic
+           1 - critical
+           2 - error
+           3 - warning
+           4 - note
+           5 - info
+           6 - detail
+           7 - debug
+
+config SPL_LOG_MAX_LEVEL
+       int "Maximum log level to record in SPL"
+       depends on SPL_LOG
+       default 3
+       help
+         This selects the maximum log level that will be recorded. Any value
+         higher than this will be ignored. If possible log statements below
+         this level will be discarded at build time. Levels:
+
+           0 - panic
+           1 - critical
+           2 - error
+           3 - warning
+           4 - note
+           5 - info
+           6 - detail
+           7 - debug
+
+config LOG_CONSOLE
+       bool "Allow log output to the console"
+       depends on LOG
+       default y
+       help
+         Enables a log driver which writes log records to the console.
+         Generally the console is the serial port or LCD display. Only the
+         log message is shown - other details like level, category, file and
+         line number are omitted.
+
+config LOG_SPL_CONSOLE
+       bool "Allow log output to the console in SPL"
+       depends on LOG_SPL
+       default y
+       help
+         Enables a log driver which writes log records to the console.
+         Generally the console is the serial port or LCD display. Only the
+         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 DEFAULT_FDT_FILE
        string "Default fdt file"
        help
 config DEFAULT_FDT_FILE
        string "Default fdt file"
        help


@@ -464,7 +546,7 @@ config BOARD_LATE_INIT
 
 config DISPLAY_CPUINFO
        bool "Display information about the CPU during start up"
 
 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
        help
          Display information about the CPU that U-Boot is running on
          when U-Boot starts up. The function print_cpuinfo() is called


@@ -472,7 +554,7 @@ config DISPLAY_CPUINFO
 
 config DISPLAY_BOARDINFO
        bool "Display information about the board during start up"
 
 config DISPLAY_BOARDINFO
        bool "Display information about the board during start up"

-       default y if ARM || M68K || MIPS || PPC || XTENSA
+       default y if ARM || M68K || MIPS || PPC || SANDBOX || XTENSA

        help
          Display information about the board that U-Boot is running on
          when U-Boot starts up. The board function checkboard() is called
        help
          Display information about the board that U-Boot is running on
          when U-Boot starts up. The board function checkboard() is called


@@ -482,7 +564,6 @@ menu "Start-up hooks"
 
 config ARCH_EARLY_INIT_R
        bool "Call arch-specific init soon after relocation"
 
 config ARCH_EARLY_INIT_R
        bool "Call arch-specific init soon after relocation"

-       default y if X86

        help
          With this option U-Boot will call arch_early_init_r() soon after
          relocation. Driver model is running by this point, and the cache
        help
          With this option U-Boot will call arch_early_init_r() soon after
          relocation. Driver model is running by this point, and the cache


@@ -499,7 +580,6 @@ config ARCH_MISC_INIT
 
 config BOARD_EARLY_INIT_F
        bool "Call board-specific init before relocation"
 
 config BOARD_EARLY_INIT_F
        bool "Call board-specific init before relocation"

-       default y if X86

        help
          Some boards need to perform initialisation as soon as possible
          after boot. With this option, U-Boot calls board_early_init_f()
        help
          Some boards need to perform initialisation as soon as possible
          after boot. With this option, U-Boot calls board_early_init_f()


@@ -521,4 +601,25 @@ config HASH
 
 endmenu
 
 
 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"
 source "common/spl/Kconfig"