kconfig: Adjust ordering so that defaults work as expected

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

diff --git a/Kconfig b/Kconfig
index f34f341dd72777151faeacb76d70e8e838c702ee..823f1e2b212220801ceed9d724d0499dee2bf6c5 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -12,6 +12,9 @@ config KCONFIG_OBJDIR
        string
        option env="KCONFIG_OBJDIR"
 
+# Allow defaults in arch-specific code to override any given here
+source "arch/Kconfig"
+
 menu "General setup"
 
 config LOCALVERSION
@@ -56,6 +59,33 @@ config CC_OPTIMIZE_FOR_SIZE
 
          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"
@@ -93,6 +123,30 @@ config TPL
        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
@@ -108,14 +162,18 @@ config SYS_EXTRA_OPTIONS
          new boards should not use this option.
 
 config SYS_TEXT_BASE
-       depends on SPARC
+       depends on SPARC || ARC
        hex "Text Base"
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
 
-endmenu                # Boot images
+config SYS_CLK_FREQ
+       depends on ARC
+       int "CPU clock frequency"
+       help
+         TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
-source "arch/Kconfig"
+endmenu                # Boot images
 
 source "common/Kconfig"
 
@@ -128,3 +186,5 @@ source "drivers/Kconfig"
 source "fs/Kconfig"
 
 source "lib/Kconfig"
+
+source "test/Kconfig"