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 | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig index 1a38645..ea2c836 100644 --- a/Kconfig +++ b/Kconfig @@ -14,6 +14,42 @@ config KCONFIG_OBJDIR
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,6 +90,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"