kconfig: add CONFIG_LOCALVERSION and CONFIG_LOCALVERSION_AUTO

Copy Kconfig options from "init/Kconfig" of Linux v3.16 tag and adjust some parts of the help document. Move CONFIG_SPL, CONFIG_TPL, ... etc. to "Boot images" menu. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

kconfig: add CONFIG_LOCALVERSION and CONFIG_LOCALVERSION_AUTO
Copy Kconfig options from "init/Kconfig" of Linux v3.16 tag and adjust some parts of the help document. Move CONFIG_SPL, CONFIG_TPL, ... etc. to "Boot images" menu. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 390f7035d3
Showing 1 changed file with 37 additions and 1 deletions Side-by-side Diff
Kconfig
@@ -14,6 +14,42 @@
  
 menu "General setup"
  
+config LOCALVERSION
+	string "Local version - append to U-Boot release"
+	depends on !SPL_BUILD
+	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.
+
+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".)
+
+endmenu		# General setup
+
+menu "Boot images"
+
 config SPL_BUILD
 	bool
 	depends on $KCONFIG_OBJDIR="spl" || $KCONFIG_OBJDIR="tpl"
@@ -54,7 +90,7 @@
 	  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"
...	...	@@ -14,6 +14,42 @@
14	14
15	15	menu "General setup"
16	16
	17	+config LOCALVERSION
	18	+ string "Local version - append to U-Boot release"
	19	+ depends on !SPL_BUILD
	20	+ help
	21	+ Append an extra string to the end of your U-Boot version.
	22	+ This will show up on your boot log, for example.
	23	+ The string you set here will be appended after the contents of
	24	+ any files with a filename matching localversion* in your
	25	+ object and source tree, in that order. Your total string can
	26	+ be a maximum of 64 characters.
	27	+
	28	+config LOCALVERSION_AUTO
	29	+ bool "Automatically append version information to the version string"
	30	+ depends on !SPL_BUILD
	31	+ default y
	32	+ help
	33	+ This will try to automatically determine if the current tree is a
	34	+ release tree by looking for git tags that belong to the current
	35	+ top of tree revision.
	36	+
	37	+ A string of the format -gxxxxxxxx will be added to the localversion
	38	+ if a git-based tree is found. The string generated by this will be
	39	+ appended after any matching localversion* files, and after the value
	40	+ set in CONFIG_LOCALVERSION.
	41	+
	42	+ (The actual string used here is the first eight characters produced
	43	+ by running the command:
	44	+
	45	+ $ git rev-parse --verify HEAD
	46	+
	47	+ which is done within the script "scripts/setlocalversion".)
	48	+
	49	+endmenu # General setup
	50	+
	51	+menu "Boot images"
	52	+
17	53	config SPL_BUILD
18	54	bool
19	55	depends on $KCONFIG_OBJDIR="spl" \|\| $KCONFIG_OBJDIR="tpl"
...	...	@@ -54,7 +90,7 @@
54	90	configuration to Kconfig. Since this option will be removed sometime,
55	91	new boards should not use this option.
56	92
57		-endmenu # General setup
	93	+endmenu # Boot images
58	94
59	95	source "arch/Kconfig"