X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=Kconfig;h=cbb691e160868a16293229854cd13517c79bcde4;hb=4ba9b1c2e3805c1399b2c432b5c0b2f1d985b88a;hp=9e77a6e28b46a38419917d2baf1de303456060db;hpb=e82abaeb7f2a0833fccf90460c48b9f2100258f8;p=u-boot

diff --git a/Kconfig b/Kconfig
index 9e77a6e28b..cbb691e160 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
@@ -60,6 +100,6 @@ 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"