X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Kconfig;h=932fc8b12af31a337d13be8eeca669b8826077a7;hb=3664816ffda6e619e0ad44fc02930a2b8929e0bf;hp=9e77a6e28b46a38419917d2baf1de303456060db;hpb=516312598ab1a310d8fa8339694b56090d87c63d;p=platform%2Fkernel%2Fu-boot.git

diff --git a/Kconfig b/Kconfig
index 9e77a6e..932fc8b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -12,13 +12,53 @@ config 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
-	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.
+
+endmenu		# General setup
+
+menu "Boot images"
 
 config SPL_BUILD
 	bool
@@ -30,8 +70,15 @@ config TPL_BUILD
 	depends on $KCONFIG_OBJDIR="tpl"
 	default y
 
+config SUPPORT_SPL
+	bool
+
+config SUPPORT_TPL
+	bool
+
 config SPL
 	bool
+	depends on SUPPORT_SPL
 	prompt "Enable SPL" if !SPL_BUILD
 	default y if SPL_BUILD
 	help
@@ -39,7 +86,7 @@ config SPL
 
 config TPL
 	bool
-	depends on SPL
+	depends on SPL && SUPPORT_TPL
 	prompt "Enable TPL" if !SPL_BUILD
 	default y if TPL_BUILD
 	default n
@@ -51,7 +98,7 @@ config SYS_EXTRA_OPTIONS
 	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
@@ -60,6 +107,18 @@ config SYS_EXTRA_OPTIONS
 	  configuration to Kconfig. Since this option will be removed sometime,
 	  new boards should not use this option.
 
-endmenu		# General setup
+endmenu		# Boot images
 
 source "arch/Kconfig"
+
+source "common/Kconfig"
+
+source "dts/Kconfig"
+
+source "net/Kconfig"
+
+source "drivers/Kconfig"
+
+source "fs/Kconfig"
+
+source "lib/Kconfig"