Move environment files from common/ to env/

[platform/kernel/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 9067d1e..4d8cae9 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -18,6 +18,15 @@ config BOOTSTAGE
          Calls to show_boot_progress() will also result in log entries but
          these will not have names.
 
          Calls to show_boot_progress() will also result in log entries but
          these will not have names.
 

+config SPL_BOOTSTAGE
+       bool "Boot timing and reported in SPL"
+       depends on BOOTSTAGE
+       help
+         Enable recording of boot time in SPL. To make this visible to U-Boot
+         proper, enable BOOTSTAGE_STASH as well. This will stash the timing
+         information when SPL finishes and load it when U-Boot proper starts
+         up.
+

 config BOOTSTAGE_REPORT
        bool "Display a detailed boot timing report before booting the OS"
        depends on BOOTSTAGE
 config BOOTSTAGE_REPORT
        bool "Display a detailed boot timing report before booting the OS"
        depends on BOOTSTAGE


@@ -38,7 +47,7 @@ config BOOTSTAGE_REPORT
                 30,361,327    445,160  start_kernel
 
 config BOOTSTAGE_USER_COUNT
                 30,361,327    445,160  start_kernel
 
 config BOOTSTAGE_USER_COUNT

-       hex "Number of boot ID numbers available for user use"
+       int "Number of boot ID numbers available for user use"

        default 20
        help
          This is the number of available user bootstage records.
        default 20
        help
          This is the number of available user bootstage records.


@@ -46,6 +55,13 @@ config BOOTSTAGE_USER_COUNT
          a new ID will be allocated from this stash. If you exceed
          the limit, recording will stop.
 
          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
+       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


@@ -90,7 +106,7 @@ config BOOTSTAGE_STASH_ADDR
 
 config BOOTSTAGE_STASH_SIZE
        hex "Size of boot timing stash region"
 
 config BOOTSTAGE_STASH_SIZE
        hex "Size of boot timing stash region"

-       default 4096
+       default 0x1000

        help
          This should be large enough to hold the bootstage stash. A value of
          4096 (4KiB) is normally plenty.
        help
          This should be large enough to hold the bootstage stash. A value of
          4096 (4KiB) is normally plenty.


@@ -170,6 +186,22 @@ 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.
+

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


@@ -352,17 +384,27 @@ config SYS_STDIO_DEREGISTER
 
 endmenu
 
 
 endmenu
 

+config DTB_RESELECT
+       bool "Support swapping dtbs at a later point in boot"
+       depends on FIT_EMBED
+       help
+         It is possible during initial boot you may need to use a generic
+         dtb until you can fully determine the board your running on. This
+         config allows boards to implement a function at a later point
+         during boot to switch to the "correct" dtb.
+
+config FIT_EMBED
+       bool "Support a FIT image embedded in the U-boot image"
+       help
+         This option provides hooks to allow U-boot to parse an
+         appended FIT image and enable board specific code to then select
+         the correct DTB to be used.
+

 config DEFAULT_FDT_FILE
        string "Default fdt file"
        help
          This option is used to set the default fdt file to boot OS.
 
 config DEFAULT_FDT_FILE
        string "Default fdt file"
        help
          This option is used to set the default fdt file to boot OS.
 

-config SYS_NO_FLASH
-       bool "Disable support for parallel NOR flash"
-       default n
-       help
-         This option is used to disable support for parallel NOR flash.
-

 config VERSION_VARIABLE
        bool "add U-Boot environment variable vers"
        default n
 config VERSION_VARIABLE
        bool "add U-Boot environment variable vers"
        default n


@@ -385,7 +427,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 || BLACKFIN || NIOS2 || X86 || XTENSA || MPC5xxx
+       default y if ARM || NIOS2 || X86 || XTENSA

        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


@@ -393,7 +435,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 || SPARC || 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


@@ -403,7 +445,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


@@ -420,7 +461,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()


@@ -430,4 +470,16 @@ config BOARD_EARLY_INIT_F
 
 endmenu
 
 
 endmenu
 

+menu "Security support"
+
+config HASH
+       bool # "Support hashing API (SHA1, SHA256, etc.)"
+       help
+         This provides a way to hash data in memory using various supported
+         algorithms (such as SHA1, MD5, CRC32). The API is defined in hash.h
+         and the algorithms it supports are defined in common/hash.c. See
+         also CMD_HASH for command-line access.
+
+endmenu
+

 source "common/spl/Kconfig"
 source "common/spl/Kconfig"