Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/Kconfig b/Kconfig
index e7002ed..626e82f 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -1,6 +1,7 @@
 #
 # For a description of the syntax of this configuration file,
 #
 # For a description of the syntax of this configuration file,

-# see Documentation/kbuild/kconfig-language.txt.
+# see the file Documentation/kbuild/kconfig-language.txt in the
+# Linux kernel source tree.

 #
 mainmenu "U-Boot $UBOOTVERSION Configuration"
 
 #
 mainmenu "U-Boot $UBOOTVERSION Configuration"
 


@@ -17,7 +18,7 @@ config LOCALVERSION
        string "Local version - append to U-Boot release"
        help
          Append an extra string to the end of your U-Boot version.
        string "Local version - append to U-Boot release"
        help
          Append an extra string to the end of your U-Boot version.

-         This will show up on your boot log, for example.
+         This will show up in your boot log, for example.

          The string you set here will be appended after the contents of
          any files with a filename matching localversion* in your
          object and source tree, in that order.  Your total string can
          The string you set here will be appended after the contents of
          any files with a filename matching localversion* in your
          object and source tree, in that order.  Your total string can


@@ -28,11 +29,11 @@ config LOCALVERSION_AUTO
        default y
        help
          This will try to automatically determine if the current tree is a
        default y
        help
          This will try to automatically determine if the current tree is a

-         release tree by looking for git tags that belong to the current
+         release tree by looking for Git tags that belong to the current

          top of tree revision.
 
          A string of the format -gxxxxxxxx will be added to the localversion
          top of tree revision.
 
          A string of the format -gxxxxxxxx will be added to the localversion

-         if a git-based tree is found.  The string generated by this will be
+         if a Git-based tree is found.  The string generated by this will be

          appended after any matching localversion* files, and after the value
          set in CONFIG_LOCALVERSION.
 
          appended after any matching localversion* files, and after the value
          set in CONFIG_LOCALVERSION.
 


@@ -52,11 +53,28 @@ config CC_OPTIMIZE_FOR_SIZE
 
          This option is enabled by default for U-Boot.
 
 
          This option is enabled by default for U-Boot.
 

+config DISTRO_DEFAULTS
+       bool "Select defaults suitable for booting general purpose Linux distributions"
+       default y if ARCH_SUNXI
+       default n
+       select CMD_BOOTZ
+       select CMD_DHCP
+       select CMD_EXT2
+       select CMD_EXT4
+       select CMD_FAT
+       select CMD_FS_GENERIC
+       select CMD_MII
+       select CMD_PING
+       select HUSH_PARSER
+       help
+         Select this to enable various options and commands which are suitable
+         for building u-boot for booting general purpose Linux distributions.
+

 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM
        help
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM
        help

-         Before relocation memory is very limited on many platforms. Still,
+         Before relocation, memory is very limited on many platforms. Still,

          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.


@@ -66,7 +84,7 @@ config SYS_MALLOC_F_LEN
        depends on SYS_MALLOC_F
        default 0x400
        help
        depends on SYS_MALLOC_F
        default 0x400
        help

-         Before relocation memory is very limited on many platforms. Still,
+         Before relocation, memory is very limited on many platforms. Still,

          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.


@@ -78,7 +96,7 @@ menuconfig EXPERT
          This option allows certain base U-Boot options and settings
          to be disabled or tweaked. This is for specialized
          environments which can tolerate a "non-standard" U-Boot.
          This option allows certain base U-Boot options and settings
          to be disabled or tweaked. This is for specialized
          environments which can tolerate a "non-standard" U-Boot.

-         Only use this if you really know what you are doing.
+         Use this only if you really know what you are doing.

 
 if EXPERT
        config SYS_MALLOC_CLEAR_ON_INIT
 
 if EXPERT
        config SYS_MALLOC_CLEAR_ON_INIT


@@ -95,7 +113,16 @@ if EXPERT
          Then the boot time can be significantly reduced.
          Warning:
          When disabling this, please check if malloc calls, maybe
          Then the boot time can be significantly reduced.
          Warning:
          When disabling this, please check if malloc calls, maybe

-         should be replaced by calloc - if expects zeroed memory.
+         should be replaced by calloc - if one expects zeroed memory.
+
+config TOOLS_DEBUG
+       bool "Enable debug information for tools"
+       help
+         Enable generation of debug information for tools such as mkimage.
+         This can be used for debugging purposes. With debug information
+         it is possible to set breakpoints on particular lines, single-step
+         debug through the source code, etc.
+

 endif
 endmenu                # General setup
 
 endif
 endmenu                # General setup
 


@@ -117,10 +144,10 @@ config SPL
 config SPL_SYS_MALLOC_SIMPLE
        bool
        depends on SPL
 config SPL_SYS_MALLOC_SIMPLE
        bool
        depends on SPL

-       prompt "Only use malloc_simple functions in the spl"
+       prompt "Only use malloc_simple functions in the SPL"

        help
          Say Y here to only use the *_simple malloc functions from
        help
          Say Y here to only use the *_simple malloc functions from

-         malloc_simple.c, rather then using the versions from dlmalloc.c
+         malloc_simple.c, rather then using the versions from dlmalloc.c;

          this will make the SPL binary smaller at the cost of more heap
          usage as the *_simple malloc functions do not re-use free-ed mem.
 
          this will make the SPL binary smaller at the cost of more heap
          usage as the *_simple malloc functions do not re-use free-ed mem.
 


@@ -182,6 +209,11 @@ config FIT
          verified boot (secure boot using RSA). This option enables that
          feature.
 
          verified boot (secure boot using RSA). This option enables that
          feature.
 

+config SPL_FIT
+       bool "Support Flattened Image Tree within SPL"
+       depends on FIT
+       depends on SPL
+

 config FIT_VERBOSE
        bool "Display verbose messages on FIT boot"
        depends on FIT
 config FIT_VERBOSE
        bool "Display verbose messages on FIT boot"
        depends on FIT


@@ -204,6 +236,12 @@ config FIT_SIGNATURE
          format support in this case, enable it using
          CONFIG_IMAGE_FORMAT_LEGACY.
 
          format support in this case, enable it using
          CONFIG_IMAGE_FORMAT_LEGACY.
 

+config SPL_FIT_SIGNATURE
+       bool "Enable signature verification of FIT firmware within SPL"
+       depends on SPL_FIT
+       depends on SPL_DM
+       select SPL_RSA
+

 config FIT_BEST_MATCH
        bool "Select the best match for the kernel device tree"
        depends on FIT
 config FIT_BEST_MATCH
        bool "Select the best match for the kernel device tree"
        depends on FIT


@@ -267,7 +305,7 @@ config SYS_EXTRA_OPTIONS
 
 config SYS_TEXT_BASE
        depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
 
 config SYS_TEXT_BASE
        depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \

-               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE
+               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS

        depends on !EFI_APP
        hex "Text Base"
        help
        depends on !EFI_APP
        hex "Text Base"
        help


@@ -284,12 +322,35 @@ config SPL_LOAD_FIT
          particular it can handle selecting from multiple device tree
          and passing the correct one to U-Boot.
 
          particular it can handle selecting from multiple device tree
          and passing the correct one to U-Boot.
 

+config SPL_FIT_IMAGE_POST_PROCESS
+       bool "Enable post-processing of FIT artifacts after loading by the SPL"
+       depends on SPL_LOAD_FIT && TI_SECURE_DEVICE
+       help
+         Allows doing any sort of manipulation to blobs after they got extracted
+         from the U-Boot FIT image like stripping off headers or modifying the
+         size of the blob, verification, authentication, decryption etc. in a
+         platform or board specific way. In order to use this feature a platform
+         or board-specific implementation of board_fit_image_post_process() must
+         be provided. Also, anything done during this post-processing step would
+         need to be comprehended in how the images were prepared before being
+         injected into the FIT creation (i.e. the blobs would have been pre-
+         processed before being added to the FIT image).
+

 config SYS_CLK_FREQ
        depends on ARC || ARCH_SUNXI
        int "CPU clock frequency"
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
 config SYS_CLK_FREQ
        depends on ARC || ARCH_SUNXI
        int "CPU clock frequency"
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 

+config ARCH_FIXUP_FDT
+       bool "Enable arch_fixup_fdt() call"
+       depends on ARM || MIPS
+       default y
+       help
+         Enable FDT memory map syncup before OS boot. This feature can be
+         used for booting OS with different memory setup where the part of
+         the memory location should be used for different purpose.
+

 endmenu                # Boot images
 
 source "common/Kconfig"
 endmenu                # Boot images
 
 source "common/Kconfig"