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

[oweals/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 9e77a6e28b46a38419917d2baf1de303456060db..75bab7f6cc05af4698adf0d6866cc9aaa27a7a56 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -12,13 +12,80 @@ config KCONFIG_OBJDIR
        string
        option env="KCONFIG_OBJDIR"
 
        string
        option env="KCONFIG_OBJDIR"
 

-config DEFCONFIG_LIST
-       string
+menu "General setup"
+
+config LOCALVERSION
+       string "Local version - append to U-Boot release"

        depends on !SPL_BUILD
        depends on !SPL_BUILD

-       option defconfig_list
-       default "configs/sandbox_defconfig"
+       help
+         Append an extra string to the end of your U-Boot version.
+         This will show up on 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
+         be a maximum of 64 characters.

 
 

-menu "General setup"
+config LOCALVERSION_AUTO
+       bool "Automatically append version information to the version string"
+       depends on !SPL_BUILD
+       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
+         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
+         appended after any matching localversion* files, and after the value
+         set in CONFIG_LOCALVERSION.
+
+         (The actual string used here is the first eight characters produced
+         by running the command:
+
+           $ git rev-parse --verify HEAD
+
+         which is done within the script "scripts/setlocalversion".)
+
+config CC_OPTIMIZE_FOR_SIZE
+       bool "Optimize for size"
+       depends on !SPL_BUILD
+       default y
+       help
+         Enabling this option will pass "-Os" instead of "-O2" to gcc
+         resulting in a smaller U-Boot image.
+
+         This option is enabled by default for U-Boot.
+
+config SYS_MALLOC_F
+       bool "Enable malloc() pool before relocation"
+       default 0x400
+       help
+         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.
+
+config SYS_MALLOC_F_LEN
+       hex "Size of malloc() pool before relocation"
+       depends on SYS_MALLOC_F
+       default 0x400
+       help
+         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.
+
+menuconfig EXPERT
+        bool "Configure standard U-Boot features (expert users)"
+        help
+          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.
+
+endmenu                # General setup
+
+menu "Boot images"

 
 config SPL_BUILD
        bool
 
 config SPL_BUILD
        bool


@@ -30,8 +97,15 @@ config TPL_BUILD
        depends on $KCONFIG_OBJDIR="tpl"
        default y
 
        depends on $KCONFIG_OBJDIR="tpl"
        default y
 

+config SUPPORT_SPL
+       bool
+
+config SUPPORT_TPL
+       bool
+

 config SPL
        bool
 config SPL
        bool

+       depends on SUPPORT_SPL

        prompt "Enable SPL" if !SPL_BUILD
        default y if SPL_BUILD
        help
        prompt "Enable SPL" if !SPL_BUILD
        default y if SPL_BUILD
        help


@@ -39,19 +113,43 @@ config SPL
 
 config TPL
        bool
 
 config TPL
        bool

-       depends on SPL
+       depends on SPL && SUPPORT_TPL

        prompt "Enable TPL" if !SPL_BUILD
        default y if TPL_BUILD
        default n
        help
          If you want to build TPL as well as the normal image and SPL, say Y.
 
        prompt "Enable TPL" if !SPL_BUILD
        default y if TPL_BUILD
        default n
        help
          If you want to build TPL as well as the normal image and SPL, say Y.
 

+config FIT
+       bool "Support Flattened Image Tree"
+       depends on !SPL_BUILD
+       help
+         This option allows to boot the new uImage structrure,
+         Flattened Image Tree.  FIT is formally a FDT, which can include
+         images of various types (kernel, FDT blob, ramdisk, etc.)
+         in a single blob.  To boot this new uImage structure,
+         pass the the address of the blob to the "bootm" command.
+
+config FIT_VERBOSE
+       bool "Display verbose messages on FIT boot"
+       depends on FIT
+
+config FIT_SIGNATURE
+       bool "Enable signature verification of FIT uImages"
+       depends on FIT
+       depends on DM
+       select RSA
+       help
+         This option enables signature verification of FIT uImages,
+         using a hash signed and verified using RSA.
+         See doc/uImage.FIT/signature.txt for more details.
+

 config SYS_EXTRA_OPTIONS
        string "Extra Options (DEPRECATED)"
        depends on !SPL_BUILD
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)
 config SYS_EXTRA_OPTIONS
        string "Extra Options (DEPRECATED)"
        depends on !SPL_BUILD
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)

-         provided the extra options field. It you have something like
+         provided the extra options field. If you have something like

          "HAS_BAR,BAZ=64", the optional options
            #define CONFIG_HAS
            #define CONFIG_BAZ  64
          "HAS_BAR,BAZ=64", the optional options
            #define CONFIG_HAS
            #define CONFIG_BAZ  64


@@ -60,6 +158,32 @@ config SYS_EXTRA_OPTIONS
          configuration to Kconfig. Since this option will be removed sometime,
          new boards should not use this option.
 
          configuration to Kconfig. Since this option will be removed sometime,
          new boards should not use this option.
 

-endmenu                # General setup
+config SYS_TEXT_BASE
+       depends on SPARC || ARC
+       hex "Text Base"
+       help
+         TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
+
+config SYS_CLK_FREQ
+       depends on ARC
+       int "CPU clock frequency"
+       help
+         TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
+
+endmenu                # Boot images

 
 source "arch/Kconfig"
 
 source "arch/Kconfig"

+
+source "common/Kconfig"
+
+source "dts/Kconfig"
+
+source "net/Kconfig"
+
+source "drivers/Kconfig"
+
+source "fs/Kconfig"
+
+source "lib/Kconfig"
+
+source "test/Kconfig"